CVS update: php4

Date: Friday June 25, 1999 @ 20:34 Author: sas Update of /repository/php4 In directory php:/tmp/cvs-serv13955 Modified Files: acconfig.h.in configure.in.in php.h Log Message: add dmalloc Index: php4/acconfig.h.in diff -u php4/acconfig.h.in:1.18 php4/acconfig.h.in:1.19 --- php4/acconfig.h.in:1.18 Wed Jun 16 13:06:51 1999 +++ php4/acconfig.h.in Fri Jun 25 20:34:36 1999 @@ -10,6 +10,8 @@ #define CONFIGURATION_FILE_PATH "php3.ini" #define USE_CONFIG_FILE 1 +#undef HAVE_DMALLOC + /* Some global constants defined by conigure */ #undef PHP_BUILD_DATE #undef PHP_OS Index: php4/configure.in.in diff -u php4/configure.in.in:1.39 php4/configure.in.in:1.40 --- php4/configure.in.in:1.39 Sun Jun 20 14:52:38 1999 +++ php4/configure.in.in Fri Jun 25 20:34:36 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.39 1999/06/20 18:52:38 sas Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.40 1999/06/26 00:34:36 sas Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. @@ -838,6 +838,19 @@ AC_MSG_RESULT(yes) ]) +DMALLOC_RESULT=no +AC_MSG_CHECKING(whether to enable dmalloc) +AC_ARG_ENABLE(dmalloc, +[ --enable-dmalloc Enable dmalloc], +[ + if test "$enableval" = "yes" ; then + AC_DEFINE(HAVE_DMALLOC, 1) + AC_ADD_LIBRARY(dmalloc) + CFLAGS="$CFLAGS -DDMALLOC_FUNC_CHECK" + DMALLOC_RESULT=yes + fi +]) +AC_MSG_RESULT($DMALLOC_RESULT) divert(3) Index: php4/php.h diff -u php4/php.h:1.17 php4/php.h:1.18 --- php4/php.h:1.17 Fri Jun 4 06:45:53 1999 +++ php4/php.h Fri Jun 25 20:34:36 1999 @@ -28,10 +28,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.17 1999/06/04 10:45:53 zeev Exp $ */ +/* $Id: php.h,v 1.18 1999/06/26 00:34:36 sas Exp $ */ #ifndef _PHP_H #define _PHP_H + +#ifdef HAVE_DMALLOC +#include <dmalloc.h> +#endif #define PHP_API_VERSION 19990421