CVS update: php3

Date: Thursday June 3, 1999 @ 8:03 Author: sas Update of /repository/php3 In directory php:/tmp/cvs-serv7338 Modified Files: ChangeLog acconfig.h config.h.in php.h configure.in Log Message: add dmalloc support Index: php3/ChangeLog diff -u php3/ChangeLog:1.660 php3/ChangeLog:1.661 --- php3/ChangeLog:1.660 Thu Jun 3 07:58:31 1999 +++ php3/ChangeLog Thu Jun 3 08:03:05 1999 @@ -1,6 +1,7 @@ PHP 3.0 CHANGE LOG ChangeLog ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ? ? 1999, Version 3.0.10 +- add "--enable-dmalloc" option (Sascha) - added workaround for 1-digit numbers not returned correct via OCI8 (Thies) - removed the limit for Ora_GetColumn/Ora_Fetch_Into again. (Thies C. Arntzen) - fix WDDX buffer bug (Sascha) Index: php3/acconfig.h diff -u php3/acconfig.h:1.97 php3/acconfig.h:1.98 --- php3/acconfig.h:1.97 Fri May 28 17:12:41 1999 +++ php3/acconfig.h Thu Jun 3 08:03:05 1999 @@ -1,3 +1,6 @@ +/* Define if you want dmalloc checking */ +#define HAVE_DMALLOC 0 + /* Define if you want to have PCRE support */ #define HAVE_PCRE 0 Index: php3/config.h.in diff -u php3/config.h.in:1.164 php3/config.h.in:1.165 --- php3/config.h.in:1.164 Fri May 28 17:12:41 1999 +++ php3/config.h.in Thu Jun 3 08:03:05 1999 @@ -65,6 +65,9 @@ /* Define to `int' if <sys/types.h> doesn't define. */ #undef uid_t +/* Define if you want dmalloc checking */ +#define HAVE_DMALLOC 0 + /* Define if you want to have PCRE support */ #define HAVE_PCRE 0 @@ -599,9 +602,6 @@ /* Define if you have the resolv library (-lresolv). */ #undef HAVE_LIBRESOLV - -/* Define if you have the t1 library (-lt1). */ -#undef HAVE_LIBT1 /* Define if you have the ttf library (-lttf). */ #undef HAVE_LIBTTF Index: php3/php.h diff -u php3/php.h:1.51 php3/php.h:1.52 --- php3/php.h:1.51 Wed Apr 21 15:42:08 1999 +++ php3/php.h Thu Jun 3 08:03:05 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.51 1999/04/21 19:42:08 ssb Exp $ */ +/* $Id: php.h,v 1.52 1999/06/03 12:03:05 sas Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -596,6 +596,10 @@ extern int yylineno; #endif extern void phprestart(FILE *input_file); + +#if HAVE_DMALLOC +#include <dmalloc.h> +#endif #endif Index: php3/configure.in diff -u php3/configure.in:1.388 php3/configure.in:1.389 --- php3/configure.in:1.388 Tue Jun 1 20:17:45 1999 +++ php3/configure.in Thu Jun 3 08:03:05 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.388 1999/06/02 00:17:45 jim Exp $ +dnl $Id: configure.in,v 1.389 1999/06/03 12:03:05 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -2632,6 +2632,20 @@ ]) AC_SUBST(PCRE_LIB) AC_SUBST(PCRE_LIBS) + +AC_MSG_CHECKING(whether to enable dmalloc support) +AC_ARG_ENABLE(dmalloc, +[ --enable-dmalloc Enable dmalloc], +[ + if test "$enableval" = "yes" ; then + LIBS="$LIBS -ldmalloc" + CFLAGS="$CFLAGS -DDMALLOC_FUNC_CHECK" + AC_DEFINE(HAVE_DMALLOC, 1) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi +],[AC_MSG_RESULT(no)]) dnl If we're using gcc and the user hasn't specified CFLAGS, add -O2. test -n "$auto_cflags" && test -n "$GCC" && CFLAGS="$CFLAGS -O2"