diff options
| author | Sascha Schumann <sas@php.net> | 2000-06-08 06:12:26 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-06-08 06:12:26 +0000 |
| commit | b4e48b952ef8c76f8652f2ca7935a6d852cea306 (patch) | |
| tree | 18dffee0faaed98b09f6a6f116e0c9cf9bec29ce | |
| parent | 039551788b551fa85983bc2ba5838fe06b3df9d9 (diff) | |
| download | php-git-b4e48b952ef8c76f8652f2ca7935a6d852cea306.tar.gz | |
Clean up acconfig.h
| -rw-r--r-- | Zend/Zend.m4 | 6 | ||||
| -rw-r--r-- | Zend/acconfig.h | 24 |
2 files changed, 3 insertions, 27 deletions
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index a2eeffaf3f..f4cde71a1e 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -135,19 +135,19 @@ AC_MSG_CHECKING(whether to enable Zend debugging) AC_MSG_RESULT($ZEND_DEBUG) if test "$ZEND_DEBUG" = "yes"; then - AC_DEFINE(ZEND_DEBUG,1) + AC_DEFINE(ZEND_DEBUG,1,[ ]) echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g" test -n "$GCC" && DEBUG_CFLAGS="$DEBUG_CFLAGS -Wall" test -n "$GCC" && test "$USE_MAINTAINER_MODE" = "yes" && \ DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations" else - AC_DEFINE(ZEND_DEBUG,0) + AC_DEFINE(ZEND_DEBUG,0,[ ]) fi test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then - AC_DEFINE(ZTS) + AC_DEFINE(ZTS,1,[ ]) ZEND_SCANNER_TYPE=cc CPPFLAGS="$CPPFLAGS -I../TSRM" LIBZEND_CPLUSPLUS_CHECKS diff --git a/Zend/acconfig.h b/Zend/acconfig.h index c51e2ecfdb..85e52829f1 100644 --- a/Zend/acconfig.h +++ b/Zend/acconfig.h @@ -3,37 +3,16 @@ @TOP@ -/* This is the default configuration file to read */ -#define USE_CONFIG_FILE 1 - /* these are defined by automake */ #undef PACKAGE #undef VERSION -/* define uint by configure if it is missed (QNX and BSD derived) */ #undef uint - -/* define ulong by configure if it is missed (most probably is) */ #undef ulong -/* Undefine if you want stricter XML/SGML compliance by default */ -/* (this disables "<?expression?>" by default) */ -#define T_DEFAULT_SHORT_OPEN_TAG 1 - -/* Define both of these if you want the bundled REGEX library */ -#define REGEX 0 -#define HSREGEX 0 - -#undef ZEND_DEBUG - /* Define if you want to enable memory limit support */ #define MEMORY_LIMIT 0 -/* Define to compile Zend thread safe */ -#undef ZTS - -#undef HAVE_LIBDL - @BOTTOM@ #ifdef HAVE_STDLIB_H @@ -50,9 +29,6 @@ # include <strings.h> #endif -/* Define if you have stdiostream.h */ -#undef HAVE_STDIOSTREAM_H - #if ZEND_BROKEN_SPRINTF int zend_sprintf(char *buffer, const char *format, ...); #else |