Get rid of config.h.stub. Note that you should embed a comment about

what the respective define does into the AC_DEFINE macro. I.e. AC_DEFINE(HAVE_FOO, 1, [Whether you have FOO])
author: Sascha Schumann <sas@php.net> 1999-12-30 04:07:46 +0000
committer: Sascha Schumann <sas@php.net> 1999-12-30 04:07:46 +0000
commit: 2c99bef442d71a455628628e932daf26aaec8a46 (patch)
tree: f4a7ca3e976ff07d3d6a730bded4ed1598b6ff8d /ext
parent: e3af8ed3217b0a3bd46382e523bb12cfdc12e230 (diff)
download: php-git-2c99bef442d71a455628628e932daf26aaec8a46.tar.gz
90 files changed, 137 insertions, 334 deletions
diff --git a/ext/aspell/config.h.stub b/ext/aspell/config.h.stub
deleted file mode 100644
index 4be31d352a..0000000000
--- a/ext/aspell/config.h.stub
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Define if you want the ASPELL interface */
-#ifndef HAVE_ASPELL
-#define HAVE_ASPELL 0
-#endif
diff --git a/ext/aspell/config.m4 b/ext/aspell/config.m4
index bfec9c4223..06b4c276c5 100644
--- a/ext/aspell/config.m4
+++ b/ext/aspell/config.m4
@@ -17,7 +17,7 @@ AC_ARG_WITH(aspell,
     if test ! -f "$ASPELL_DIR/include/aspell-c.h"; then
       AC_MSG_ERROR(Could not find aspell-c.h in $ASPELL_DIR/include - please copy it manually from the aspell sources to $ASPELL_DIR/include)
     fi
-    AC_DEFINE(HAVE_ASPELL)
+    AC_DEFINE(HAVE_ASPELL,1,[Whether you have aspell])
     AC_MSG_RESULT(yes)
 	PHP_EXTENSION(aspell)
   else
diff --git a/ext/bcmath/config.h.stub b/ext/bcmath/config.h.stub
deleted file mode 100644
index 6346c81f10..0000000000
--- a/ext/bcmath/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Define if you want to enable bc style precision math support */
-#define WITH_BCMATH 0
diff --git a/ext/bcmath/config.m4 b/ext/bcmath/config.m4
index 960d3863f6..472889f799 100644
--- a/ext/bcmath/config.m4
+++ b/ext/bcmath/config.m4
@@ -7,7 +7,7 @@ AC_ARG_ENABLE(bcmath,
                           get this module installed. ],
 [
   if test "$enableval" = "yes"; then
-    AC_DEFINE(WITH_BCMATH, 1)
+    AC_DEFINE(WITH_BCMATH, 1, [Whether you have bcmath])
     AC_MSG_RESULT(yes)
     PHP_EXTENSION(bcmath)
   else
diff --git a/ext/cpdf/config.h.stub b/ext/cpdf/config.h.stub
deleted file mode 100644
index 26412fe3be..0000000000
--- a/ext/cpdf/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Define if you have the zlib library */
-#define HAVE_CPDFLIB 0
diff --git a/ext/cpdf/config.m4 b/ext/cpdf/config.m4
index b3b52ea107..61d4e0bae0 100644
--- a/ext/cpdf/config.m4
+++ b/ext/cpdf/config.m4
@@ -12,7 +12,7 @@ AC_ARG_WITH(cpdflib,
     yes)
       AC_MSG_RESULT(yes)
       PHP_EXTENSION(cpdflib)
-      AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB)],
+      AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
         [AC_MSG_ERROR(Cpdf module requires cpdflib >= 2.)])
       AC_ADD_LIBRARY(cpdf)
       AC_ADD_LIBRARY(tiff)
@@ -58,7 +58,7 @@ AC_ARG_WITH(cpdflib,
         withval=$old_withval
 
           LIBS="$LIBS -L$withval/lib"
-        AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB)],
+        AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
           [AC_MSG_ERROR(Cpdflib module requires cpdflib >= 2.)])
         LIBS=$old_LIBS
         AC_ADD_LIBRARY_WITH_PATH(cpdf, $withval/lib)
diff --git a/ext/cybercash/config.h.stub b/ext/cybercash/config.h.stub
deleted file mode 100644
index fb5502d911..0000000000
--- a/ext/cybercash/config.h.stub
+++ /dev/null
@@ -1 +0,0 @@
-#define HAVE_MCK 0
diff --git a/ext/cybercash/config.m4 b/ext/cybercash/config.m4
index 648968b9e3..5f5730441a 100644
--- a/ext/cybercash/config.m4
+++ b/ext/cybercash/config.m4
@@ -15,7 +15,7 @@ AC_ARG_WITH(cybercash,
 	LIBS="$LIBS -L$MCK_DIR/lib"
 	AC_ADD_LIBRARY_WITH_PATH(mckcrypto, $MCK_DIR/lib)
 	AC_ADD_INCLUDE($MCK_DIR)
-	AC_DEFINE(HAVE_MCK)
+	AC_DEFINE(HAVE_MCK,,[Whether you have CyberCash])
       else
         AC_MSG_ERROR(Please reinstall the CyberCash MCK - I cannot find mckcrypt.h)
         AC_MSG_RESULT(no)
diff --git a/ext/dav/config.h.stub b/ext/dav/config.h.stub
deleted file mode 100644
index 90a0bc1de4..0000000000
--- a/ext/dav/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Define to compile with mod_dav support */
-#define HAVE_MOD_DAV 0
diff --git a/ext/dav/config.m4 b/ext/dav/config.m4
index c2b83adbc7..3847c5cb26 100644
--- a/ext/dav/config.m4
+++ b/ext/dav/config.m4
@@ -13,17 +13,17 @@ AC_ARG_WITH(mod-dav,
   else
     if test "$withval" != "no"; then
       AC_MSG_RESULT(yes)
-      AC_DEFINE(HAVE_MOD_DAV, 1)
+      AC_DEFINE(HAVE_MOD_DAV, 1, [Whether you have mod_dav])
       CFLAGS="$CFLAGS -DHAVE_MOD_DAV -I$withval"
       INCLUDES="$INCLUDES -I$withval"
       PHP_EXTENSION(dav)
     else
       AC_MSG_RESULT(no)
-      AC_DEFINE(HAVE_MOD_DAV, 0)
+      AC_DEFINE(HAVE_MOD_DAV, 0, [Whether you have mod_dav])
     fi
   fi
 ],[
   AC_MSG_RESULT(no)
-  AC_DEFINE(HAVE_MOD_DAV, 0)
+  AC_DEFINE(HAVE_MOD_DAV, 0, [Whether you have mod_dav])
 ])
 
diff --git a/ext/db/config.h.stub b/ext/db/config.h.stub
deleted file mode 100644
index e952d61fac..0000000000
--- a/ext/db/config.h.stub
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Define if you have an ndbm compatible library (-ldbm).  */
-#define NDBM 0
-
-/* Define if you have the gdbm library (-lgdbm).  */
-#define GDBM 0
diff --git a/ext/db/config.m4 b/ext/db/config.m4
index a7042d141b..710931ccd8 100644
--- a/ext/db/config.m4
+++ b/ext/db/config.m4
@@ -9,10 +9,10 @@ AC_CHECK_HEADERS(db1/ndbm.h)
 # Checks for libraries.
 # Prefer gdbm, Berkeley DB and ndbm/dbm, in that order
 AC_DEFUN(AC_PREFERRED_DB_LIB,[
-  AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM) DBM_TYPE=gdbm; DBM_LIB=-lgdbm],
-  [AC_CHECK_LIB(db, dbm_open,[AC_DEFINE(NDBM) DBM_TYPE=ndbm; DBM_LIB=-ldb],
-   [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM) DBM_TYPE=ndbm; DBM_LIB=],
-    [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM) DBM_TYPE=ndbm; DBM_LIB=-ldbm],
+  AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM,, [Whether you have GDBM]) DBM_TYPE=gdbm; DBM_LIB=-lgdbm],
+  [AC_CHECK_LIB(db, dbm_open,[AC_DEFINE(NDBM,, [Whether you have NDBM]) DBM_TYPE=ndbm; DBM_LIB=-ldb],
+   [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM,,[ ]) DBM_TYPE=ndbm; DBM_LIB=],
+    [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM,,[ ]) DBM_TYPE=ndbm; DBM_LIB=-ldbm],
      [DBM_TYPE=""])])])])
   AC_MSG_CHECKING([preferred dbm library])
   if test "a$DBM_TYPE" = a; then
diff --git a/ext/dba/config.h.stub b/ext/dba/config.h.stub
deleted file mode 100644
index df25632a4b..0000000000
--- a/ext/dba/config.h.stub
+++ /dev/null
@@ -1,19 +0,0 @@
-/* define if you want to use the dba extension */
-
-#define NDBM_DB1_NDBM_H 0
-#define NDBM_NDBM_H 0
-#define DB2_DB2_DB_H 0
-#define DB2_DB_DB2_H 0
-#define DB2_DB_H 0
-#define DB2_DB2_H 0
-#define DB3_DB_H 0
-#define HAVE_DBA 0
-#define DBA_GDBM 0
-#define DBA_NDBM 0
-#define DBA_DBOPEN 0
-#define DBA_DB2 0
-#define DBA_DB3 0
-#define DBA_DBM 0
-#define DBA_CDB 0
-
-
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 7ddcd8eb3b..c5310ef247 100644
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -65,7 +65,7 @@ AC_ARG_WITH(gdbm,
 
     unset ac_cv_lib_gdbm_gdbm_open
     AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
-    AC_CHECK_LIB(gdbm, gdbm_open, [AC_DEFINE(DBA_GDBM, 1) THIS_LIBS="gdbm"])
+    AC_CHECK_LIB(gdbm, gdbm_open, [AC_DEFINE(DBA_GDBM, 1, [ ]) THIS_LIBS="gdbm"])
     ])
     
     AC_DBA_STD_ASSIGN
@@ -90,12 +90,12 @@ AC_ARG_WITH(ndbm,
 	done
     
     if test "$NDBM_EXTRA" != ""; then
-      eval "AC_DEFINE($NDBM_EXTRA, 1)"
+      eval "AC_DEFINE($NDBM_EXTRA, 1, [ ])"
     fi
 
     for LIB in db1 ndbm c; do
       AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
-      AC_CHECK_LIB($LIB, dbm_open, [AC_DEFINE(DBA_NDBM,1) THIS_LIBS="$LIB"])
+      AC_CHECK_LIB($LIB, dbm_open, [AC_DEFINE(DBA_NDBM,1, [ ]) THIS_LIBS="$LIB"])
       ])
     done
     
@@ -135,12 +135,12 @@ AC_ARG_WITH(db2,
     fi
     
     if test -n "$DB2_EXTRA"; then
-      eval "AC_DEFINE($DB2_EXTRA, 1)"
+      eval "AC_DEFINE($DB2_EXTRA, 1, [ ])"
     fi
 
     for LIB in db db2 c; do
       AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
-      AC_CHECK_LIB($LIB, db_appinit, [AC_DEFINE(DBA_DB2,1) THIS_LIBS="$LIB"])
+      AC_CHECK_LIB($LIB, db_appinit, [AC_DEFINE(DBA_DB2,1,[ ]) THIS_LIBS="$LIB"])
       ])
     done
     
@@ -163,12 +163,12 @@ AC_ARG_WITH(db3,
 	done
 
     if test -n "$DB3_EXTRA"; then
-      eval "AC_DEFINE($DB3_EXTRA, 1)"
+      eval "AC_DEFINE($DB3_EXTRA, 1, [ ])"
     fi
 
     for LIB in db; do
       AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
-      AC_CHECK_LIB($LIB, db_create, [AC_DEFINE(DBA_DB3,1) THIS_LIBS="$LIB"])
+      AC_CHECK_LIB($LIB, db_create, [AC_DEFINE(DBA_DB3,1,[ ]) THIS_LIBS="$LIB"])
       ])
     done
     
@@ -191,7 +191,7 @@ AC_ARG_WITH(dbm,
 
     for LIB in db1 dbm c; do
       AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
-      AC_CHECK_LIB($LIB, dbminit, [AC_DEFINE(DBA_DBM,1) THIS_LIBS="$LIB"])
+      AC_CHECK_LIB($LIB, dbminit, [AC_DEFINE(DBA_DBM,1,[ ]) THIS_LIBS="$LIB"])
       ])
     done
     
@@ -214,7 +214,7 @@ AC_ARG_WITH(cdb,
 
     for LIB in cdb c; do
       AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
-      AC_CHECK_LIB($LIB, cdb_bread, [AC_DEFINE(DBA_CDB,1) THIS_LIBS="$LIB"])
+      AC_CHECK_LIB($LIB, cdb_bread, [AC_DEFINE(DBA_CDB,1,[ ]) THIS_LIBS="$LIB"])
       ])
     done
     
@@ -229,10 +229,10 @@ AC_DBA_STD_RESULT
 AC_MSG_CHECKING(whether to enable DBA interface)
 if test "$HAVE_DBA" = "1"; then
   AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_DBA, 1)
+  AC_DEFINE(HAVE_DBA, 1, [ ])
   PHP_EXTENSION(dba)
 else
   AC_MSG_RESULT(no)
-  AC_DEFINE(HAVE_DBA, 0)
+  AC_DEFINE(HAVE_DBA, 0, [ ])
 fi
 
diff --git a/ext/dbase/config.h.stub b/ext/dbase/config.h.stub
deleted file mode 100644
index c8bf0adbe2..0000000000
--- a/ext/dbase/config.h.stub
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Define if you want to use the supplied dbase library */
-#define DBASE 0
-
diff --git a/ext/dbase/config.m4 b/ext/dbase/config.m4
index 1241888987..b8746c6825 100644
--- a/ext/dbase/config.m4
+++ b/ext/dbase/config.m4
@@ -6,13 +6,13 @@ AC_ARG_WITH(dbase,
 [
   if test "$withval" = "yes"; then
 	AC_MSG_RESULT(yes)
-	AC_DEFINE(DBASE,1)
+	AC_DEFINE(DBASE,1,[ ])
 	PHP_EXTENSION(dbase)
   else
 	AC_MSG_RESULT(no)
-	AC_DEFINE(DBASE,0)
+	AC_DEFINE(DBASE,0,[ ])
   fi
 ],[
   AC_MSG_RESULT(no)
-  AC_DEFINE(DBASE,0)
+  AC_DEFINE(DBASE,0,[ ])
 ])
diff --git a/ext/domxml/config.h.stub b/ext/domxml/config.h.stub
deleted file mode 100644
index 0a9d0706b5..0000000000
--- a/ext/domxml/config.h.stub
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Define if you have the gnome xml library */
-#define HAVE_DOMXML 0
-
diff --git a/ext/domxml/config.m4 b/ext/domxml/config.m4
index 308f98d2b0..68d986d833 100644
--- a/ext/domxml/config.m4
+++ b/ext/domxml/config.m4
@@ -14,7 +14,7 @@ AC_ARG_WITH(dom,
       PHP_EXTENSION(domxml)
       old_LIBS=$LIBS
       LIBS="$LIBS -lgz"
-      AC_CHECK_LIB(xml, xmlNewDoc, [AC_DEFINE(HAVE_DOMXML)],
+      AC_CHECK_LIB(xml, xmlNewDoc, [AC_DEFINE(HAVE_DOMXML,,[ ])],
         [AC_MSG_ERROR(DOM module requires libxml >= 1.0)])
       LIBS=$old_LIBS
       AC_ADD_LIBRARY(gz)
@@ -52,7 +52,7 @@ AC_ARG_WITH(dom,
           LIBS="$LIBS -L$withval/lib -lz"
         fi
 
-        AC_CHECK_LIB(xml, xmlNewDoc, [AC_DEFINE(HAVE_DOMXML)],
+        AC_CHECK_LIB(xml, xmlNewDoc, [AC_DEFINE(HAVE_DOMXML,,[ ])],
           [AC_MSG_ERROR(DOM module requires libxml >= 1.0.)])
         LIBS=$old_LIBS
         AC_ADD_LIBRARY_WITH_PATH(xml, $withval/lib)
diff --git a/ext/ext_skel b/ext/ext_skel
index eadab951b9..9da91d3304 100755
--- a/ext/ext_skel
+++ b/ext/ext_skel
@@ -65,7 +65,6 @@ eof
 $ECHO_N " .cvsignore$ECHO_C"
 cat >.cvsignore <<eof
 .deps
-Makefile.in
 Makefile
 *.o
 *.lo
@@ -73,12 +72,6 @@ Makefile
 .libs
 eof
 
-$ECHO_N " config.h.stub$ECHO_C"
-cat >config.h.stub<<eof
-/* define if you want to use the $extname extension */
-/* #undef HAVE_LIB$EXTNAME */
-eof
-
 chmod 644 *
 
 echo " [done]."
diff --git a/ext/fdf/config.h.stub b/ext/fdf/config.h.stub
deleted file mode 100644
index de2cdd917d..0000000000
--- a/ext/fdf/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Define if you have the fdftk library */
-#define HAVE_FDFLIB 0
diff --git a/ext/fdf/config.m4 b/ext/fdf/config.m4
index 29f9c6e5e3..9cbb2d07b2 100644
--- a/ext/fdf/config.m4
+++ b/ext/fdf/config.m4
@@ -13,7 +13,7 @@ AC_ARG_WITH(fdftk,
       AC_MSG_RESULT(yes)
       PHP_EXTENSION(fdf)
       AC_CHECK_LIB(FdfTk, FDFOpen, [
-        AC_DEFINE(HAVE_FDFLIB)
+        AC_DEFINE(HAVE_FDFLIB,,[ ])
         EXTRA_LIBS="$EXTRA_LIBS -lFdfTk"
       ],[AC_MSG_ERROR(fdftk module requires fdftk 2.0)])
       ;;
@@ -25,7 +25,7 @@ AC_ARG_WITH(fdftk,
         old_LIBS=$LIBS
         LIBS="$LIBS -L$withval/lib"
         AC_CHECK_LIB(FdfTk, FDFOpen, [
-          AC_DEFINE(HAVE_FDFLIB)
+          AC_DEFINE(HAVE_FDFLIB,,[ ])
           EXTRA_LIBS="$EXTRA_LIBS -L$withval/lib -lFdfTk"
         ],[AC_MSG_ERROR(fdftk module requires fdftk lib 2.0.)])
         LIBS=$old_LIBS
diff --git a/ext/filepro/config.h.stub b/ext/filepro/config.h.stub
deleted file mode 100644
index 0a273b1502..0000000000
--- a/ext/filepro/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-#define HAVE_FILEPRO 0
-
diff --git a/ext/filepro/config.m4 b/ext/filepro/config.m4
index 2c0fd3b43b..a0036668b2 100644
--- a/ext/filepro/config.m4
+++ b/ext/filepro/config.m4
@@ -4,14 +4,14 @@ AC_MSG_CHECKING(whether to include the bundled filePro support)
 AC_ARG_WITH(filepro,
 [  --with-filepro          Include the bundled read-only filePro support],[
   if test "$withval" != "no"; then
-    AC_DEFINE(HAVE_FILEPRO, 1)
+    AC_DEFINE(HAVE_FILEPRO, 1, [ ])
     AC_MSG_RESULT(yes)
     PHP_EXTENSION(filepro)
   else
-    AC_DEFINE(HAVE_FILEPRO, 0)
+    AC_DEFINE(HAVE_FILEPRO, 0, [ ])
     AC_MSG_RESULT(no)
   fi
 ],[
-  AC_DEFINE(HAVE_FILEPRO, 0)
+  AC_DEFINE(HAVE_FILEPRO, 0, [ ])
   AC_MSG_RESULT(no)
 ]) 
diff --git a/ext/ftp/config.h.stub b/ext/ftp/config.h.stub
deleted file mode 100644
index d63248456c..0000000000
--- a/ext/ftp/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-/* define if you want to use the ftp extension */
-#define HAVE_FTP 0
diff --git a/ext/ftp/config.m4 b/ext/ftp/config.m4
index 7b01e6b54d..6f6e3bd652 100644
--- a/ext/ftp/config.m4
+++ b/ext/ftp/config.m4
@@ -7,7 +7,7 @@ AC_ARG_WITH(ftp,
 [  --with-ftp              Include FTP support.],
 [
   if test "$withval" != "no"; then
-    AC_DEFINE(HAVE_FTP)
+    AC_DEFINE(HAVE_FTP,,[ ])
     PHP_EXTENSION(ftp)
     AC_MSG_RESULT(yes)
   else
diff --git a/ext/gd/config.h.stub b/ext/gd/config.h.stub
deleted file mode 100644
index 1fce8aa1a0..0000000000
--- a/ext/gd/config.h.stub
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Define if you have the gd library (-lgd). */
-#define HAVE_LIBGD 0
-
-/* Define if you have the gd version 1.3 library (-lgd). */
-#define HAVE_LIBGD13 0
-
-#undef HAVE_GDIMAGECOLORRESOLVE
-#undef FREETYPE_4BIT_ANTIALIAS_HACK
-#undef HAVE_LIBFREETYPE
-#undef HAVE_LIBTTF
-
-/* Some versions of GD support both PNG and GIF. Set defines for both. */
-#undef HAVE_GD_PNG
-#undef HAVE_GD_GIF
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 504bac78b2..d992b3771e 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -12,7 +12,7 @@ AC_ARG_WITH(gd,
     no)
       AC_MSG_RESULT(no) ;;
     yes)
-      AC_DEFINE(HAVE_LIBGD)
+      AC_DEFINE(HAVE_LIBGD,,[ ])
       if test "$shared" = "yes"; then
         AC_MSG_RESULT(yes (shared))
         GD_LIBS="-lgd"
@@ -22,12 +22,12 @@ AC_ARG_WITH(gd,
       fi
         old_LDFLAGS=$LDFLAGS
 		old_LIBS=$LIBS
-        AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ])
+        AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13,,[ ]) ])
 		LIBS="$LIBS -lpng -lz"
-        AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1)])
+        AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1,[ ])])
 dnl Some versions of GD support both PNG and GIF. Check for both.
-        AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1)])
-        AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1)])
+        AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])])
+        AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1, [ ])])
         
         LIBS=$old_LIBS
         LDFLAGS=$old_LDFLAGS
@@ -60,7 +60,7 @@ dnl A whole whack of possible places where this might be
       test -f $withval/gd/libgd.a && GD_LIB="$withval/gd"
       test -f $withval/gd1.3/libgd.a && GD_LIB="$withval/gd1.3"
       if test -n "$GD_INCLUDE" && test -n "$GD_LIB" ; then
-        AC_DEFINE(HAVE_LIBGD)
+        AC_DEFINE(HAVE_LIBGD,,[ ])
         if test "$shared" = "yes"; then
           AC_MSG_RESULT(yes (shared))
           GD_LIBS="-lgd"
@@ -72,11 +72,11 @@ dnl A whole whack of possible places where this might be
         old_LDFLAGS=$LDFLAGS
         LDFLAGS="$LDFLAGS -L$GD_LIB"
 		old_LIBS=$LIBS
-        AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ])
+        AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13,, [ ]) ])
 		LIBS="$LIBS -lpng -lz"
-        AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1)])
-        AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1)])
-        AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1)])
+        AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1,[ ])])
+        AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])])
+        AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1, [ ])])
         
         LIBS=$old_LIBS
         LDFLAGS=$old_LDFLAGS
@@ -91,14 +91,14 @@ dnl A whole whack of possible places where this might be
   esac
 ],[
   AC_CHECK_LIB(gd, gdImageLine)
-  AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ])
+  AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13,, [ ]) ])
   if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then
 		old_LIBS=$LIBS
-        AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ])
+        AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13,, [ ]) ])
 		LIBS="$LIBS -lpng -lz"
-        AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1)])
-        AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1)])
-        AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1)])
+        AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1, [ ])])
+        AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])])
+        AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1, [ ])])
         
         LIBS=$old_LIBS
         LDFLAGS=$old_LDFLAGS
@@ -131,7 +131,7 @@ if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then
       fi
     done
     if test -n "$FREETYPE_DIR" ; then
-      AC_DEFINE(HAVE_LIBFREETYPE)
+      AC_DEFINE(HAVE_LIBFREETYPE,,[ ])
       if test "$shared" = "yes"; then
         GD_LIBS="$GD_LIBS -lfreetype"
         GD_LFLAGS="$GD_LFLAGS -L$FREETYPE_DIR/lib"
@@ -142,7 +142,7 @@ if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then
       AC_MSG_RESULT(yes)
     else
       if test -n "$TTF_DIR" ; then
-        AC_DEFINE(HAVE_LIBTTF)
+        AC_DEFINE(HAVE_LIBTTF,,[ ])
         if test "$shared" = "yes"; then
           GD_LIBS="$GD_LIBS -lttf"
           GD_LFLAGS="$GD_LFLAGS -L$TTF_DIR/lib"
@@ -168,7 +168,7 @@ if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then
   [  --enable-freetype-4bit-antialias-hack  
                           Include support for FreeType2 (experimental).],[
   if test "$enableval" = "yes" ; then
-    AC_DEFINE(FREETYPE_4BIT_ANTIALIAS_HACK, 1)
+    AC_DEFINE(FREETYPE_4BIT_ANTIALIAS_HACK, 1, [ ])
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
diff --git a/ext/gettext/config.h.stub b/ext/gettext/config.h.stub
deleted file mode 100644
index 54fe1349ce..0000000000
--- a/ext/gettext/config.h.stub
+++ /dev/null
@@ -1,3 +0,0 @@
-/* define if you want to use the gettext extension */
-
-#define HAVE_LIBINTL 0
diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4
index b14673527a..0570b7f2c5 100644
--- a/ext/gettext/config.m4
+++ b/ext/gettext/config.m4
@@ -31,7 +31,7 @@ AC_ARG_WITH(gettext,
         ],)
     ],)
 
-    AC_DEFINE(HAVE_LIBINTL)
+    AC_DEFINE(HAVE_LIBINTL,,[ ])
     PHP_EXTENSION(gettext)
 
 	EXTRA_LIBS="$EXTRA_LIBS $GETTEXT_LFLAGS $GETTEXT_LIBS"
diff --git a/ext/hyperwave/config.h.stub b/ext/hyperwave/config.h.stub
deleted file mode 100644
index d8e8bf43ab..0000000000
--- a/ext/hyperwave/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Define if you want Hyperwave support */
-#define HYPERWAVE 0
diff --git a/ext/hyperwave/config.m4 b/ext/hyperwave/config.m4
index ef48f24954..2044a162f2 100644
--- a/ext/hyperwave/config.m4
+++ b/ext/hyperwave/config.m4
@@ -5,14 +5,14 @@ AC_ARG_WITH(hyperwave,
 [  --with-hyperwave        Include Hyperwave support],
 [
   if test "$withval" != "no"; then
-    AC_DEFINE(HYPERWAVE,1)
+    AC_DEFINE(HYPERWAVE,1,[ ])
     AC_MSG_RESULT(yes)
     PHP_EXTENSION(hyperwave)
   else
-    AC_DEFINE(HYPERWAVE,0)
+    AC_DEFINE(HYPERWAVE,0,[ ])
     AC_MSG_RESULT(no)
   fi
 ],[
-  AC_DEFINE(HYPERWAVE,0)
+  AC_DEFINE(HYPERWAVE,0,[ ])
   AC_MSG_RESULT(no)
 ])
diff --git a/ext/icap/config.h.stub b/ext/icap/config.h.stub
deleted file mode 100644
index 0d5247a428..0000000000
--- a/ext/icap/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Define if you want the ICAP extension */
-#define HAVE_ICAP 0
diff --git a/ext/icap/config.m4 b/ext/icap/config.m4
index c22a52ddc1..04732dde1f 100644
--- a/ext/icap/config.m4
+++ b/ext/icap/config.m4
@@ -13,7 +13,7 @@ AC_ARG_WITH(icap,
     
     AC_ADD_INCLUDE($ICAP_DIR)
     AC_ADD_LIBRARY_WITH_PATH(icap, $ICAP_DIR)
-    AC_DEFINE(HAVE_ICAP)
+    AC_DEFINE(HAVE_ICAP,,[ ])
     PHP_EXTENSION(icap)
     AC_MSG_RESULT(yes)
   else
diff --git a/ext/imap/config.h.stub b/ext/imap/config.h.stub
deleted file mode 100644
index d225ffa092..0000000000
--- a/ext/imap/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Define if you want the IMAP extension */
-#define HAVE_IMAP 0
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index 9eec8c0ad1..da8cf80e2a 100644
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -50,7 +50,7 @@ AC_ARG_WITH(imap,
 		fi
 		AC_ADD_LIBRARY_WITH_PATH($IMAP_LIB, $IMAP_LIBDIR)
 		AC_ADD_INCLUDE($IMAP_INC_DIR)
-		AC_DEFINE(HAVE_IMAP)
+		AC_DEFINE(HAVE_IMAP,,[ ])
 		AC_MSG_RESULT(yes)
 		PHP_EXTENSION(imap)
 	else
diff --git a/ext/informix/config.h.stub b/ext/informix/config.h.stub
deleted file mode 100644
index a61d630e4d..0000000000
--- a/ext/informix/config.h.stub
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef HAVE_IFX
-#define HAVE_IFX 0
-#endif
-#ifndef HAVE_IFX_IUS
-#define HAVE_IFX_IUS 0
-#endif
-#ifndef IFX_VERSION
-#define IFX_VERSION 0
-#endif
diff --git a/ext/informix/config.m4 b/ext/informix/config.m4
index ef48c852c3..20c9e8096e 100644
--- a/ext/informix/config.m4
+++ b/ext/informix/config.m4
@@ -57,17 +57,17 @@ WARNING: You specified Informix base install directory that is different
         if test "`uname -s 2>/dev/null`" = "AIX"; then
         CFLAGS="$CFLAGS -D__H_LOCALEDEF"
       fi
-      AC_DEFINE(HAVE_IFX)
+      AC_DEFINE(HAVE_IFX,,[ ])
       AC_MSG_CHECKING([Informix version])
       IFX_VERSION=[`esql -V | sed -ne '1 s/^[^0-9]*\([0-9]\)\.\([0-9]*\).*/\1\2/p'`]
       if test $IFX_VERSION -ge "900"; then
-        AC_DEFINE(HAVE_IFX_IUS)
+        AC_DEFINE(HAVE_IFX_IUS,,[ ])
         IFX_ESQL_FLAGS="-EDHAVE_IFX_IUS"
       else
         IFX_ESQL_FLAGS="-EUHAVE_IFX_IUS"
       fi
       PHP_SUBST(IFX_ESQL_FLAGS)
-      AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION)
+      AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION, [ ])
       AC_MSG_RESULT(yes)
       PHP_EXTENSION(informix)
       for i in $IFX_LIBS; do
diff --git a/ext/interbase/config.h.stub b/ext/interbase/config.h.stub
deleted file mode 100644
index d54ee2a9d6..0000000000
--- a/ext/interbase/config.h.stub
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef HAVE_IBASE
-#define HAVE_IBASE 0
-#endif
diff --git a/ext/interbase/config.m4 b/ext/interbase/config.m4
index 2328e25e1a..08f050138a 100644
--- a/ext/interbase/config.m4
+++ b/ext/interbase/config.m4
@@ -16,7 +16,7 @@ AC_ARG_WITH(interbase,
     IBASE_INCLUDE=-I$IBASE_INCDIR
     IBASE_LFLAGS=-L$IBASE_LIBDIR
     IBASE_LIBS="-lgds"
-    AC_DEFINE(HAVE_IBASE)
+    AC_DEFINE(HAVE_IBASE,,[ ])
     AC_MSG_RESULT(yes)
     EXTRA_LIBS="$EXTRA_LIBS $IBASE_LFLAGS $IBASE_LIBS"
     INCLUDES="$INCLUDES $IBASE_INCLUDE"
diff --git a/ext/java/config.h.stub b/ext/java/config.h.stub
deleted file mode 100644
index 737d5d39ff..0000000000
--- a/ext/java/config.h.stub
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef HAVE_JAVA
-#define HAVE_JAVA 0
-#endif
diff --git a/ext/java/config.m4 b/ext/java/config.m4
index 1cb6f634ba..28a86d3c5b 100644
--- a/ext/java/config.m4
+++ b/ext/java/config.m4
@@ -49,7 +49,7 @@ AC_ARG_WITH(java,
       fi
     fi
 
-    AC_DEFINE(HAVE_JAVA)
+    AC_DEFINE(HAVE_JAVA,,[ ])
     PHP_EXTENSION(java, shared)
     PHP_BUILD_SHARED
     AC_MSG_RESULT(yes)
diff --git a/ext/ldap/config.h.stub b/ext/ldap/config.h.stub
deleted file mode 100644
index f0da3f0d5c..0000000000
--- a/ext/ldap/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Define if you want the LDAP directory interface */
-#define HAVE_LDAP 0
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index a3c1dcef4e..9380eeb639 100644
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -50,17 +50,17 @@ dnl these here if necessary.   -RL
 	elif test -f $LDAP_LIBDIR/libldapssl30.so; then
         AC_ADD_LIBRARY(ldapssl30)
         AC_ADD_LIBRARY($LDAP_PTHREAD)
-		AC_DEFINE(HAVE_NSLDAP)
+		AC_DEFINE(HAVE_NSLDAP,,[ ])
 	elif test -f $LDAP_LIBDIR/libldapssl30.sl; then
         AC_ADD_LIBRARY(ldapssl30)
-		AC_DEFINE(HAVE_NSLDAP)
+		AC_DEFINE(HAVE_NSLDAP,,[ ])
 	elif test -f $LDAP_LIBDIR/libldap30.so; then
         AC_ADD_LIBRARY(ldap30)
         AC_ADD_LIBRARY($LDAP_PTHREAD)
-		AC_DEFINE(HAVE_NSLDAP)
+		AC_DEFINE(HAVE_NSLDAP,,[ ])
 	elif test -f $LDAP_LIBDIR/libldap30.sl; then
         AC_ADD_LIBRARY(ldap30)
-		AC_DEFINE(HAVE_NSLDAP)
+		AC_DEFINE(HAVE_NSLDAP,,[ ])
 	elif test -f $LDAP_LIBDIR/libumich_ldap.so; then
         AC_ADD_LIBRARY(umich_ldap)
         AC_ADD_LIBRARY(umich_lber)
@@ -69,7 +69,7 @@ dnl these here if necessary.   -RL
     AC_ADD_INCLUDE($LDAP_INCDIR)
     AC_ADD_LIBPATH($LDAP_LIBDIR)
 
-    AC_DEFINE(HAVE_LDAP)
+    AC_DEFINE(HAVE_LDAP,,[ ])
 
     AC_MSG_RESULT(yes)
     PHP_EXTENSION(ldap)
diff --git a/ext/mcal/config.h.stub b/ext/mcal/config.h.stub
deleted file mode 100644
index fb51531c78..0000000000
--- a/ext/mcal/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Define if you want the MCAL extension */
-#define HAVE_MCAL 0
diff --git a/ext/mcal/config.m4 b/ext/mcal/config.m4
index 914203e0ac..03f1d0bc2c 100644
--- a/ext/mcal/config.m4
+++ b/ext/mcal/config.m4
@@ -13,7 +13,7 @@ AC_ARG_WITH(mcal,
     
     AC_ADD_INCLUDE($MCAL_DIR)
     AC_ADD_LIBRARY_WITH_PATH(mcal, $MCAL_DIR)
-    AC_DEFINE(HAVE_MCAL)
+    AC_DEFINE(HAVE_MCAL,,[ ])
     PHP_EXTENSION(mcal)
     AC_MSG_RESULT(yes)
   else
diff --git a/ext/mcrypt/config.h.stub b/ext/mcrypt/config.h.stub
deleted file mode 100644
index 28fbe03ae2..0000000000
--- a/ext/mcrypt/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-/* define if you want to use the mcrypt extension */
-#undef HAVE_LIBMCRYPT
diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
index 530e118a04..4becc36e1e 100644
--- a/ext/mcrypt/config.m4
+++ b/ext/mcrypt/config.m4
@@ -19,7 +19,7 @@ AC_ARG_WITH(mcrypt,
     AC_ADD_INCLUDE($MCRYPT_DIR/include)
     AC_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib)
 
-    AC_DEFINE(HAVE_LIBMCRYPT)
+    AC_DEFINE(HAVE_LIBMCRYPT,,[ ])
 
     AC_MSG_RESULT(yes)
     PHP_EXTENSION(mcrypt)
diff --git a/ext/mhash/config.h.stub b/ext/mhash/config.h.stub
deleted file mode 100644
index 9785cc2bec..0000000000
--- a/ext/mhash/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-/* define if you want to use the mhash extension */
-#undef HAVE_LIBMHASH
diff --git a/ext/mhash/config.m4 b/ext/mhash/config.m4
index 34077138d5..7a82830c9f 100644
--- a/ext/mhash/config.m4
+++ b/ext/mhash/config.m4
@@ -19,7 +19,7 @@ AC_ARG_WITH(mhash,
     AC_ADD_INCLUDE($MHASH_DIR/include)
     AC_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib)
 
-    AC_DEFINE(HAVE_LIBMHASH)
+    AC_DEFINE(HAVE_LIBMHASH,,[ ])
 
     AC_MSG_RESULT(yes)
     PHP_EXTENSION(mhash)
diff --git a/ext/msql/config.h.stub b/ext/msql/config.h.stub
deleted file mode 100644
index 64a3517ae2..0000000000
--- a/ext/msql/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-#define HAVE_MSQL 0
-#define MSQL1 0
diff --git a/ext/msql/config.m4 b/ext/msql/config.m4
index 3ed38f3e46..0213377017 100644
--- a/ext/msql/config.m4
+++ b/ext/msql/config.m4
@@ -9,10 +9,10 @@ AC_DEFUN(AC_MSQL_VERSION,[
   CFLAGS="$INCLUDES $CFLAGS"
   AC_TRY_COMPILE([#include <sys/types.h>
 #include "msql.h"],[int i = IDX_TYPE],[
-    AC_DEFINE(MSQL1,0)
+    AC_DEFINE(MSQL1,0,[ ])
     MSQL_VERSION="2.0 or newer"
   ],[
-    AC_DEFINE(MSQL1,1)
+    AC_DEFINE(MSQL1,1,[ ])
     MSQL_VERSION="1.0"
   ])
   CFLAGS=$ac_php_oldcflags
@@ -34,7 +34,7 @@ AC_ARG_WITH(msql,
     fi
     AC_ADD_LIBRARY_WITH_PATH(msql, $MSQL_LIBDIR)
     AC_ADD_INCLUDE($MSQL_INCDIR)
-    AC_DEFINE(HAVE_MSQL)
+    AC_DEFINE(HAVE_MSQL,,[ ])
     AC_MSG_RESULT(yes)
     PHP_EXTENSION(msql)
     AC_MSQL_VERSION
diff --git a/ext/oci8/config.h.stub b/ext/oci8/config.h.stub
deleted file mode 100644
index 74081b4d41..0000000000
--- a/ext/oci8/config.h.stub
+++ /dev/null
@@ -1,4 +0,0 @@
-/* define if you want to use the oci8 extension */
-/* #undef HAVE_LIBOCI8 */
-#define HAVE_OCI8 0   
-
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index eff3028f64..11d8ba1c48 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -148,11 +148,11 @@ AC_ARG_WITH(oci8,
     	else
     	  ORACLE_SHLIBS="$ORACLE_STLIBS"
     	fi
-        AC_DEFINE(HAVE_OCI8)
+        AC_DEFINE(HAVE_OCI8,,[ ])
     	;;
       8.1)
 	ORACLE_SHLIBS="-lclntsh $ORA_SYSLIB"
-	AC_DEFINE(HAVE_OCI8)
+	AC_DEFINE(HAVE_OCI8,,[ ])
 	;;
       *)
   	ORACLE_SHLIBS=
@@ -162,7 +162,7 @@ AC_ARG_WITH(oci8,
     # only using shared libs right now
     ORACLE_LIBS=$ORACLE_SHLIBS
 
-    AC_DEFINE(HAVE_ORACLE)
+    AC_DEFINE(HAVE_ORACLE,,[ ])
 
   fi
 
diff --git a/ext/odbc/config.h.stub b/ext/odbc/config.h.stub
deleted file mode 100644
index 1c1c8afdab..0000000000
--- a/ext/odbc/config.h.stub
+++ /dev/null
@@ -1,12 +0,0 @@
-#undef HAVE_SOLID
-#undef HAVE_IBMDB2
-#undef HAVE_IODBC
-#undef HAVE_ESOOB
-#undef HAVE_UNIXODBC
-#undef HAVE_OPENLINK
-#undef HAVE_ADABAS
-#undef HAVE_CODBC
-#undef HAVE_UODBC
-#undef HAVE_EMPRESS
-#undef HAVE_VELOCIS
-#undef HAVE_DBMAKER
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index fa0cbd7fc9..959b257d61 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -89,7 +89,7 @@ AC_ARG_WITH(adabas,
     AC_ADD_LIBRARY(sqlrte)
     AC_ADD_LIBRARY(sqlptc)
     ODBC_TYPE=adabas
-    AC_DEFINE(HAVE_ADABAS)
+    AC_DEFINE(HAVE_ADABAS,,[ ])
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
@@ -113,7 +113,7 @@ AC_ARG_WITH(solid,
     ODBC_LIBDIR=$withval/lib
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_TYPE=solid
-    AC_DEFINE(HAVE_SOLID)
+    AC_DEFINE(HAVE_SOLID,,[ ])
     AC_MSG_RESULT(yes)
     AC_FIND_SOLID_LIBS($ODBC_LIBDIR)
   else
@@ -141,7 +141,7 @@ AC_ARG_WITH(ibm-db2,
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_TYPE=db2
     ODBC_LIBS="-ldb2"
-    AC_DEFINE(HAVE_IBMDB2)
+    AC_DEFINE(HAVE_IBMDB2,,[ ])
 
     AC_MSG_RESULT(yes)
   else
@@ -168,7 +168,7 @@ AC_ARG_WITH(empress,
     fi
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_TYPE=empress
-    AC_DEFINE(HAVE_EMPRESS)
+    AC_DEFINE(HAVE_EMPRESS,,[ ])
     AC_MSG_RESULT(yes)
     AC_FIND_EMPRESS_LIBS($ODBC_LIBDIR)
   else
@@ -202,7 +202,7 @@ AC_ARG_WITH(velocis,
         ODBC_LIBS="-l_rdbc -l_sql";;
     esac
     ODBC_TYPE=velocis
-    AC_DEFINE(HAVE_VELOCIS)
+    AC_DEFINE(HAVE_VELOCIS,,[ ])
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
@@ -238,7 +238,7 @@ AC_ARG_WITH(custom-odbc,
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LIBS=$CUSTOM_ODBC_LIBS
     ODBC_TYPE=custom
-    AC_DEFINE(HAVE_CODBC)
+    AC_DEFINE(HAVE_CODBC,,[ ])
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
@@ -264,7 +264,7 @@ AC_ARG_WITH(iodbc,
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LIBS=-liodbc
     ODBC_TYPE=iodbc
-    AC_DEFINE(HAVE_IODBC)
+    AC_DEFINE(HAVE_IODBC,,[ ])
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
@@ -291,7 +291,7 @@ AC_ARG_WITH(esoob,
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LIBS=-lesoobclient
     ODBC_TYPE=ESOOB
-    AC_DEFINE(HAVE_ESOOB)
+    AC_DEFINE(HAVE_ESOOB,,[ ])
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
@@ -317,7 +317,7 @@ AC_ARG_WITH(unixODBC,
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LIBS=-lodbc
     ODBC_TYPE=unixODBC
-    AC_DEFINE(HAVE_UNIXODBC)
+    AC_DEFINE(HAVE_UNIXODBC,,[ ])
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
@@ -344,7 +344,7 @@ AC_ARG_WITH(openlink,
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LIBS=-liodbc
     ODBC_TYPE=openlink
-    AC_DEFINE(HAVE_OPENLINK)
+    AC_DEFINE(HAVE_OPENLINK,,[ ])
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
@@ -377,7 +377,7 @@ AC_ARG_WITH(dbmaker,
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LIBS="-ldmapic -lc"
     ODBC_TYPE=dbmaker
-    AC_DEFINE(HAVE_DBMAKER)
+    AC_DEFINE(HAVE_DBMAKER,,[ ])
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
@@ -390,7 +390,7 @@ fi
 if test -n "$ODBC_TYPE" && test -n "$ODBC_INCLUDE"; then
   INCLUDES="$INCLUDES $ODBC_INCLUDE"
   EXTRA_LIBS="$EXTRA_LIBS $ODBC_LFLAGS $ODBC_LIBS"
-  AC_DEFINE(HAVE_UODBC)
+  AC_DEFINE(HAVE_UODBC,,[ ])
   PHP_SUBST(ODBC_INCDIR)
   PHP_SUBST(ODBC_INCLUDE)
   PHP_SUBST(ODBC_LIBDIR)
diff --git a/ext/oracle/config.h.stub b/ext/oracle/config.h.stub
deleted file mode 100644
index f6f3bcd81b..0000000000
--- a/ext/oracle/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Define if you have the Oracle database client libraries */
-#define HAVE_ORACLE 0
diff --git a/ext/oracle/config.m4 b/ext/oracle/config.m4
index ffe50db702..7f7c8b94a2 100644
--- a/ext/oracle/config.m4
+++ b/ext/oracle/config.m4
@@ -146,11 +146,11 @@ AC_ARG_WITH(oracle,
     	else
     	  ORACLE_SHLIBS="$ORACLE_STLIBS"
     	fi
-        AC_DEFINE(HAVE_OCI8)
+        AC_DEFINE(HAVE_OCI8,,[ ])
     	;;
       8.1)
 	ORACLE_SHLIBS="-lclntsh $ORA_SYSLIB"
-	AC_DEFINE(HAVE_OCI8)
+	AC_DEFINE(HAVE_OCI8,,[ ])
 	;;
       *)
   	ORACLE_SHLIBS=
@@ -160,7 +160,7 @@ AC_ARG_WITH(oracle,
     # only using shared libs right now
     ORACLE_LIBS=$ORACLE_SHLIBS
 
-    AC_DEFINE(HAVE_ORACLE)
+    AC_DEFINE(HAVE_ORACLE,,[ ])
 
   fi
 
diff --git a/ext/pcre/config.h.stub b/ext/pcre/config.h.stub
deleted file mode 100644
index 128deea9ab..0000000000
--- a/ext/pcre/config.h.stub
+++ /dev/null
@@ -1,5 +0,0 @@
-/* define if you want to use the PCRE extension */
-#define	HAVE_PCRE 0
-
-#define HAVE_BUNDLED_PCRE 0
-#undef USE_BCOPY
diff --git a/ext/pcre/config.m4 b/ext/pcre/config.m4
index 5105fe4bfe..9592bc0e2b 100644
--- a/ext/pcre/config.m4
+++ b/ext/pcre/config.m4
@@ -18,7 +18,7 @@ AC_ARG_WITH(pcre-regex,
 		yes)
 			EXTRA_LIBS="-L$abs_builddir/ext/pcre/pcrelib -lpcre $EXTRA_LIBS"
 			PCRE_SUBDIR="pcrelib"
-			AC_DEFINE(HAVE_BUNDLED_PCRE, 1)
+			AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
 			AC_MSG_RESULT(yes)
 			PHP_EXTENSION(pcre)
 			PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile)
@@ -45,7 +45,7 @@ AC_ARG_WITH(pcre-regex,
 				AC_MSG_ERROR(Could not find libpcre.a in $withval)
 			fi
 
-			AC_DEFINE(HAVE_PCRE, 1)
+			AC_DEFINE(HAVE_PCRE, 1, [ ])
 			AC_MSG_RESULT(yes)
 			PHP_EXTENSION(pcre)
 			;;
@@ -53,7 +53,7 @@ AC_ARG_WITH(pcre-regex,
 ],[
   PCRE_LIBADD=pcrelib/libpcre.la
   PCRE_SUBDIRS=pcrelib
-  AC_DEFINE(HAVE_BUNDLED_PCRE, 1)
+  AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
   AC_MSG_RESULT(yes)
   PHP_EXTENSION(pcre)
   PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile)
@@ -61,4 +61,4 @@ AC_ARG_WITH(pcre-regex,
 PHP_SUBST(PCRE_LIBADD)
 PHP_SUBST(PCRE_SUBDIRS)
 
-AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1)])
+AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1, [ ])])
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index 5105fe4bfe..9592bc0e2b 100644
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -18,7 +18,7 @@ AC_ARG_WITH(pcre-regex,
 		yes)
 			EXTRA_LIBS="-L$abs_builddir/ext/pcre/pcrelib -lpcre $EXTRA_LIBS"
 			PCRE_SUBDIR="pcrelib"
-			AC_DEFINE(HAVE_BUNDLED_PCRE, 1)
+			AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
 			AC_MSG_RESULT(yes)
 			PHP_EXTENSION(pcre)
 			PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile)
@@ -45,7 +45,7 @@ AC_ARG_WITH(pcre-regex,
 				AC_MSG_ERROR(Could not find libpcre.a in $withval)
 			fi
 
-			AC_DEFINE(HAVE_PCRE, 1)
+			AC_DEFINE(HAVE_PCRE, 1, [ ])
 			AC_MSG_RESULT(yes)
 			PHP_EXTENSION(pcre)
 			;;
@@ -53,7 +53,7 @@ AC_ARG_WITH(pcre-regex,
 ],[
   PCRE_LIBADD=pcrelib/libpcre.la
   PCRE_SUBDIRS=pcrelib
-  AC_DEFINE(HAVE_BUNDLED_PCRE, 1)
+  AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
   AC_MSG_RESULT(yes)
   PHP_EXTENSION(pcre)
   PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile)
@@ -61,4 +61,4 @@ AC_ARG_WITH(pcre-regex,
 PHP_SUBST(PCRE_LIBADD)
 PHP_SUBST(PCRE_SUBDIRS)
 
-AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1)])
+AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1, [ ])])
diff --git a/ext/pdf/config.h.stub b/ext/pdf/config.h.stub
deleted file mode 100644
index fa9fed71eb..0000000000
--- a/ext/pdf/config.h.stub
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Define if you have the pdflib library */
-#define HAVE_PDFLIB 0
-
diff --git a/ext/pdf/config.m4 b/ext/pdf/config.m4
index 39bfe3eee6..e45eb3c9e9 100644
--- a/ext/pdf/config.m4
+++ b/ext/pdf/config.m4
@@ -16,7 +16,7 @@ echo $withval
       old_LDFLAGS=$LDFLAGS
 		  old_LIBS=$LIBS
 		  LIBS="$LIBS -ltiff -ljpeg -lz"
-      AC_CHECK_LIB(pdf, PDF_close, [AC_DEFINE(HAVE_PDFLIB)],
+      AC_CHECK_LIB(pdf, PDF_close, [AC_DEFINE(HAVE_PDFLIB,,[ ])],
         [AC_MSG_ERROR(pdflib extension requires pdflib 2.x. You may as well need libtiff and libjpeg. In such a case use the options --with-tiff-dir=<DIR> and --with-jpeg-dir=<DIR>)])
       LIBS=$old_LIBS
       LDFLAGS=$old_LDFLAGS
@@ -94,7 +94,7 @@ echo $withval
 
         old_LIBS=$LIBS
         LIBS="$LIBS -L$withval/lib"
-        AC_CHECK_LIB(pdf, PDF_close, [AC_DEFINE(HAVE_PDFLIB) PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf"],
+        AC_CHECK_LIB(pdf, PDF_close, [AC_DEFINE(HAVE_PDFLIB,,[ ]) PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf"],
           [AC_MSG_ERROR(pdflib extension requires pdflib 2.x.)])
         LIBS=$old_LIBS
         AC_ADD_LIBRARY_WITH_PATH(pdf, $withval/lib)
diff --git a/ext/pgsql/config.h.stub b/ext/pgsql/config.h.stub
deleted file mode 100644
index fa21acc568..0000000000
--- a/ext/pgsql/config.h.stub
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef HAVE_PGSQL
-#define HAVE_PGSQL 0
-#endif
-
-#ifndef HAVE_PQCMDTUPLES
-#define HAVE_PQCMDTUPLES 0
-#endif
-
diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
index 4e9aafbf35..adbcdd937b 100644
--- a/ext/pgsql/config.m4
+++ b/ext/pgsql/config.m4
@@ -37,7 +37,7 @@ AC_ARG_WITH(pgsql,
 
     old_CFLAGS=$CFLAGS
     CFLAGS="$CFLAGS $PGSQL_INCLUDE"
-    AC_DEFINE(HAVE_PGSQL)
+    AC_DEFINE(HAVE_PGSQL,,[ ])
     if test "$shared" = "yes"; then
       AC_MSG_RESULT(yes (shared))
       PGSQL_SHARED="pgsql.la"
@@ -47,7 +47,7 @@ AC_ARG_WITH(pgsql,
       AC_ADD_INCLUDE($PGSQL_INCDIR)
       PGSQL_STATIC="libphpext_pgsql.la"
     fi
-    AC_CHECK_FUNC(PQcmdTuples,AC_DEFINE(HAVE_PQCMDTUPLES))
+    AC_CHECK_FUNC(PQcmdTuples,AC_DEFINE(HAVE_PQCMDTUPLES,,[ ]))
     CFLAGS=$old_CFLAGS
     PHP_EXTENSION(pgsql,$shared)
   else
diff --git a/ext/posix/config.h.stub b/ext/posix/config.h.stub
deleted file mode 100644
index e69de29bb2..0000000000
--- a/ext/posix/config.h.stub
+++ /dev/null
diff --git a/ext/readline/config.h.stub b/ext/readline/config.h.stub
deleted file mode 100644
index 76d47f6bcd..0000000000
--- a/ext/readline/config.h.stub
+++ /dev/null
@@ -1,3 +0,0 @@
-/* define if you want to use the readline extension */
-
-#undef HAVE_LIBREADLINE
diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index c34d8df521..623eb8a852 100644
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -24,7 +24,7 @@ AC_ARG_WITH(readline,
 
     AC_MSG_RESULT(yes)
 
-	AC_DEFINE(HAVE_LIBREADLINE, 1)
+	AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
 	PHP_EXTENSION(readline)
   else
     AC_MSG_RESULT(no)
diff --git a/ext/rpc/config.h.stub b/ext/rpc/config.h.stub
deleted file mode 100644
index 737d5d39ff..0000000000
--- a/ext/rpc/config.h.stub
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef HAVE_JAVA
-#define HAVE_JAVA 0
-#endif
diff --git a/ext/rpc/java/config.h.stub b/ext/rpc/java/config.h.stub
deleted file mode 100644
index 737d5d39ff..0000000000
--- a/ext/rpc/java/config.h.stub
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef HAVE_JAVA
-#define HAVE_JAVA 0
-#endif
diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index 1cb6f634ba..28a86d3c5b 100644
--- a/ext/rpc/java/config.m4
+++ b/ext/rpc/java/config.m4
@@ -49,7 +49,7 @@ AC_ARG_WITH(java,
       fi
     fi
 
-    AC_DEFINE(HAVE_JAVA)
+    AC_DEFINE(HAVE_JAVA,,[ ])
     PHP_EXTENSION(java, shared)
     PHP_BUILD_SHARED
     AC_MSG_RESULT(yes)
diff --git a/ext/snmp/config.h.stub b/ext/snmp/config.h.stub
deleted file mode 100644
index 2e837eac70..0000000000
--- a/ext/snmp/config.h.stub
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Define if you want the SNMP interface */
-#define HAVE_SNMP 0
-
-#undef UCD_SNMP_HACK
diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
index ef4f3a5a2a..4dcbb4f069 100644
--- a/ext/snmp/config.m4
+++ b/ext/snmp/config.m4
@@ -40,7 +40,7 @@ AC_ARG_WITH(snmp,
       test -d $withval/include/ucd-snmp && SNMP_INCDIR=$withval/include/ucd-snmp
       SNMP_LIBDIR=$withval/lib
     fi
-    AC_DEFINE(HAVE_SNMP)
+    AC_DEFINE(HAVE_SNMP,,[ ])
     if test "$shared" = "yes"; then
       AC_MSG_RESULT(yes (shared))
       SNMP_INCLUDE="-I$SNMP_INCDIR"
@@ -73,7 +73,7 @@ AC_MSG_CHECKING(whether to enable UCD SNMP hack)
 AC_ARG_ENABLE(ucd-snmp-hack,
 [  --enable-ucd-snmp-hack  Enable UCD SNMP hack],[
   if test "$enableval" = "yes" ; then
-    AC_DEFINE(UCD_SNMP_HACK, 1)
+    AC_DEFINE(UCD_SNMP_HACK, 1, [ ])
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
diff --git a/ext/standard/config.h.stub b/ext/standard/config.h.stub
deleted file mode 100644
index 6021062968..0000000000
--- a/ext/standard/config.h.stub
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Define if you have the crypt() function */
-#define HAVE_CRYPT 1
-
-/* Define if you have and want to use libcrypt */
-#define HAVE_LIBCRYPT 0
-
-/* crypt capability checks */
-#undef PHP3_STD_DES_CRYPT
-#undef PHP3_EXT_DES_CRYPT
-#undef PHP3_MD5_CRYPT
-#undef PHP3_BLOWFISH_CRYPT
-
-/* Define if you have libdl (used for dynamic linking) */
-#undef HAVE_LIBDL
-
-#undef HAVE_GETWD
-#undef HAVE_GETCWD
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 8225bb7ec1..7fc5bad5fb 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -24,9 +24,9 @@ main() {
   ])
   ])
   if test "$ac_cv_crypt_des" = "yes"; then
-    AC_DEFINE(PHP3_STD_DES_CRYPT, 1)
+    AC_DEFINE(PHP3_STD_DES_CRYPT, 1, [ ])
   else
-    AC_DEFINE(PHP3_STD_DES_CRYPT, 0)
+    AC_DEFINE(PHP3_STD_DES_CRYPT, 0, [ ])
   fi
 
   AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[
@@ -46,9 +46,9 @@ main() {
   ])
   ])
   if test "$ac_cv_crypt_ext_des" = "yes"; then
-    AC_DEFINE(PHP3_EXT_DES_CRYPT,1)
+    AC_DEFINE(PHP3_EXT_DES_CRYPT,1, [ ])
   else
-    AC_DEFINE(PHP3_EXT_DES_CRYPT,0)
+    AC_DEFINE(PHP3_EXT_DES_CRYPT,0, [ ])
   fi
 
   AC_CACHE_CHECK(for MD5 crypt, ac_cv_crypt_md5,[
@@ -77,9 +77,9 @@ main() {
   ])
   ])
   if test "$ac_cv_crypt_md5" = "yes"; then
-    AC_DEFINE(PHP3_MD5_CRYPT,1)
+    AC_DEFINE(PHP3_MD5_CRYPT,1,[ ])
   else
-    AC_DEFINE(PHP3_MD5_CRYPT,0)
+    AC_DEFINE(PHP3_MD5_CRYPT,0,[ ])
   fi
 
   AC_CACHE_CHECK(for Blowfish crypt, ac_cv_crypt_blowfish,[
@@ -105,26 +105,26 @@ main() {
   ])
   ])
   if test "$ac_cv_crypt_blowfish" = "yes"; then
-    AC_DEFINE(PHP3_BLOWFISH_CRYPT,1)
+    AC_DEFINE(PHP3_BLOWFISH_CRYPT,1,[ ])
   else
-    AC_DEFINE(PHP3_BLOWFISH_CRYPT,0)
+    AC_DEFINE(PHP3_BLOWFISH_CRYPT,0,[ ])
   fi
 ])
 
 AC_CHECK_LIB(c, dlopen, [
  # fake it
- AC_DEFINE(HAVE_LIBDL) ], [
+ AC_DEFINE(HAVE_LIBDL,,[ ]) ], [
  AC_CHECK_LIB(dl, dlopen, [
   LIBS="-ldl $LIBS"
-  AC_DEFINE(HAVE_LIBDL) ], []) ])
+  AC_DEFINE(HAVE_LIBDL,,[ ]) ], []) ])
 
 AC_CHECK_LIB(pam, pam_start, [
   EXTRA_LIBS="$EXTRA_LIBS -lpam"
-  AC_DEFINE(HAVE_LIBPAM) ], []) 
+  AC_DEFINE(HAVE_LIBPAM,,[ ]) ], []) 
 
 AC_CHECK_LIB(crypt, crypt, [
  AC_ADD_LIBRARY(crypt)
- AC_DEFINE(HAVE_LIBCRYPT) ], [])
+ AC_DEFINE(HAVE_LIBCRYPT,,[ ]) ], [])
 
 AC_CHECK_FUNCS(getcwd)
 AC_CHECK_FUNCS(getwd)
diff --git a/ext/sybase/config.h.stub b/ext/sybase/config.h.stub
deleted file mode 100644
index 85202aa97d..0000000000
--- a/ext/sybase/config.h.stub
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Define if you have libdnet_stub (used for Sybase support) */
-#define HAVE_LIBDNET_STUB 0
-
-#define HAVE_SYBASE 0
diff --git a/ext/sybase/config.m4 b/ext/sybase/config.m4
index 8de191127f..cd0928b1ec 100644
--- a/ext/sybase/config.m4
+++ b/ext/sybase/config.m4
@@ -20,9 +20,9 @@ AC_ARG_WITH(sybase,
     PHP_EXTENSION(sybase)
     AC_CHECK_LIB(dnet_stub, dnet_addr,
      [ AC_ADD_LIBRARY(dnet_stub)
-        AC_DEFINE(HAVE_LIBDNET_STUB)
+        AC_DEFINE(HAVE_LIBDNET_STUB,,[ ])
      ])
-    AC_DEFINE(HAVE_SYBASE)
+    AC_DEFINE(HAVE_SYBASE,,[ ])
   else
     AC_MSG_RESULT(no)
   fi
diff --git a/ext/sybase_ct/config.h.stub b/ext/sybase_ct/config.h.stub
deleted file mode 100644
index 7edaee454c..0000000000
--- a/ext/sybase_ct/config.h.stub
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Define if you have libdnet_stub (used for Sybase support) */
-#define HAVE_LIBDNET_STUB 0
-
-#define HAVE_SYBASE_CT 0
diff --git a/ext/sybase_ct/config.m4 b/ext/sybase_ct/config.m4
index d2cde0d9ca..3bfdea28c7 100644
--- a/ext/sybase_ct/config.m4
+++ b/ext/sybase_ct/config.m4
@@ -10,7 +10,7 @@ AC_ARG_WITH(sybase-ct,
     if test -z "$SYBASE_LIBS"; then
       PHP_EXTENSION(sybase_ct)
     fi
-    AC_DEFINE(HAVE_SYBASE_CT)
+    AC_DEFINE(HAVE_SYBASE_CT,,[ ])
     if test "$withval" = "yes"; then
       SYBASE_CT_INCDIR=/home/sybase/include
       SYBASE_CT_LIBDIR=/home/sybase/lib
diff --git a/ext/sysvsem/config.h.stub b/ext/sysvsem/config.h.stub
deleted file mode 100644
index 09634a8cfd..0000000000
--- a/ext/sysvsem/config.h.stub
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Define if you want System V semaphore support.
- */
-#define HAVE_SYSVSEM 0
-
-/* Define if you have union semun.
- */
-#define HAVE_SEMUN 0
diff --git a/ext/sysvsem/config.m4 b/ext/sysvsem/config.m4
index afdd602e30..c0b3b3c029 100644
--- a/ext/sysvsem/config.m4
+++ b/ext/sysvsem/config.m4
@@ -7,7 +7,7 @@ AC_ARG_ENABLE(sysvsem,
   if test "$enableval" = "yes"; then
     AC_MSG_RESULT(yes)
     PHP_EXTENSION(sysvsem)
-    AC_DEFINE(HAVE_SYSVSEM, 1)
+    AC_DEFINE(HAVE_SYSVSEM, 1, [ ])
     AC_CACHE_CHECK(for union semun,php_cv_semun,
       AC_TRY_COMPILE([
 #include <sys/types.h>
@@ -22,16 +22,16 @@ AC_ARG_ENABLE(sysvsem,
       ])
     )
   if test $php_cv_semun = "yes"; then
-    AC_DEFINE(HAVE_SEMUN, 1)
+    AC_DEFINE(HAVE_SEMUN, 1, [ ])
   else
-    AC_DEFINE(HAVE_SEMUN, 0)
+    AC_DEFINE(HAVE_SEMUN, 0, [ ])
   fi
   else
     AC_MSG_RESULT(no)
-    AC_DEFINE(HAVE_SYSVSEM, 0)
+    AC_DEFINE(HAVE_SYSVSEM, 0, [ ])
   fi
 ],[
   AC_MSG_RESULT(no)
-  AC_DEFINE(HAVE_SYSVSEM, 0)
+  AC_DEFINE(HAVE_SYSVSEM, 0, [ ])
 ])
 
diff --git a/ext/sysvshm/config.h.stub b/ext/sysvshm/config.h.stub
deleted file mode 100644
index 9b5f5e35cb..0000000000
--- a/ext/sysvshm/config.h.stub
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Define if you want System V shared memory support.
- */
-#define HAVE_SYSVSHM 0
diff --git a/ext/sysvshm/config.m4 b/ext/sysvshm/config.m4
index 287841f26d..17c7699dcf 100644
--- a/ext/sysvshm/config.m4
+++ b/ext/sysvshm/config.m4
@@ -4,14 +4,14 @@ AC_MSG_CHECKING(whether to enable System V shared memory support)
 AC_ARG_ENABLE(sysvshm,
 [  --enable-sysvshm        Enable the System V shared memory support],[
   if test "$enableval" = "yes"; then
-    AC_DEFINE(HAVE_SYSVSHM, 1)
+    AC_DEFINE(HAVE_SYSVSHM, 1, [ ])
     AC_MSG_RESULT(yes)
     PHP_EXTENSION(sysvshm)
   else
-    AC_DEFINE(HAVE_SYSVSHM, 0)
+    AC_DEFINE(HAVE_SYSVSHM, 0, [ ])
     AC_MSG_RESULT(no)
   fi
 ],[
-  AC_DEFINE(HAVE_SYSVSHM, 0)
+  AC_DEFINE(HAVE_SYSVSHM, 0, [ ])
   AC_MSG_RESULT(no)
 ]) 
diff --git a/ext/wddx/config.h.stub b/ext/wddx/config.h.stub
deleted file mode 100644
index 9dedf15dff..0000000000
--- a/ext/wddx/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-/* define if you want to use the wddx extension */
-#define HAVE_WDDX 0
diff --git a/ext/wddx/config.m4 b/ext/wddx/config.m4
index 2b8078f596..c02884e7f9 100644
--- a/ext/wddx/config.m4
+++ b/ext/wddx/config.m4
@@ -8,7 +8,7 @@ AC_ARG_WITH(wddx,
     if test "${with_xml+set}" != "set" -o "$with_xml" = "no"; then
 	AC_MSG_ERROR(WDDX requires --with-xml)
     else
-        AC_DEFINE(HAVE_WDDX, 1)
+        AC_DEFINE(HAVE_WDDX, 1, [ ])
         AC_MSG_RESULT(yes)
         PHP_EXTENSION(wddx)
     fi
diff --git a/ext/xml/config.h.stub b/ext/xml/config.h.stub
deleted file mode 100644
index a4abe9b584..0000000000
--- a/ext/xml/config.h.stub
+++ /dev/null
@@ -1,4 +0,0 @@
-/* define if you want to use the xml extension */
-
-/* Define if you have the expat (XML Parser Toolkit) library */
-#define HAVE_LIBEXPAT 0
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4
index 64e7f70732..a346e05598 100644
--- a/ext/xml/config.m4
+++ b/ext/xml/config.m4
@@ -35,7 +35,7 @@ AC_ARG_WITH(xml,
       fi
     fi
     fi
-    AC_DEFINE(HAVE_LIBEXPAT, 1)
+    AC_DEFINE(HAVE_LIBEXPAT, 1, [ ])
     PHP_EXTENSION(xml, $shared)
     if test "$shared" != "yes"; then
       EXTRA_LIBS="$EXTRA_LIBS $XML_LIBS"
diff --git a/ext/yp/config.h.stub b/ext/yp/config.h.stub
deleted file mode 100644
index 768e64e5a9..0000000000
--- a/ext/yp/config.h.stub
+++ /dev/null
@@ -1,5 +0,0 @@
-/* define if you want to use the yp extension */
-/* #undef HAVE_LIBYP */
-
-#undef HAVE_YP
-#undef SOLARIS_YP
diff --git a/ext/yp/config.m4 b/ext/yp/config.m4
index 981be1b589..151661abf8 100644
--- a/ext/yp/config.m4
+++ b/ext/yp/config.m4
@@ -8,13 +8,13 @@ AC_ARG_WITH(yp,
 [
 	if test "$withval" = "yes"; then
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_YP)
+		AC_DEFINE(HAVE_YP,,[ ])
 		PHP_EXTENSION(yp)
 		if test `uname` = "SunOS";then
 			release=`uname -r`
 			case "$release" in
 				5*)
-					AC_DEFINE(SOLARIS_YP)
+					AC_DEFINE(SOLARIS_YP,,[ ])
 					;;
 				*)
 					;;
diff --git a/ext/zlib/config.h.stub b/ext/zlib/config.h.stub
deleted file mode 100644
index 5d6dcad205..0000000000
--- a/ext/zlib/config.h.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Define if you have the zlib library */
-#define HAVE_ZLIB 0
diff --git a/ext/zlib/config.m4 b/ext/zlib/config.m4
index d6537c7b86..e4111b9dca 100644
--- a/ext/zlib/config.m4
+++ b/ext/zlib/config.m4
@@ -12,7 +12,7 @@ AC_ARG_WITH(zlib,
     yes)
       AC_MSG_RESULT(yes)
       PHP_EXTENSION(zlib)
-      AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB)],
+      AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB,,[ ])],
         [AC_MSG_ERROR(Zlib module requires zlib >= 1.0.9.)])
       AC_ADD_LIBRARY(z)
       ;;
@@ -24,7 +24,7 @@ AC_ARG_WITH(zlib,
         PHP_EXTENSION(zlib)
         old_LIBS=$LIBS
         LIBS="$LIBS -L$withval/lib"
-        AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB)],
+        AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB,,[ ])],
           [AC_MSG_ERROR(Zlib module requires zlib >= 1.0.9.)])
         LIBS=$old_LIBS
         AC_ADD_LIBRARY_WITH_PATH(z, $withval/lib)
author	Sascha Schumann <sas@php.net>	1999-12-30 04:07:46 +0000
committer	Sascha Schumann <sas@php.net>	1999-12-30 04:07:46 +0000
commit	2c99bef442d71a455628628e932daf26aaec8a46 (patch)
tree	f4a7ca3e976ff07d3d6a730bded4ed1598b6ff8d /ext
parent	e3af8ed3217b0a3bd46382e523bb12cfdc12e230 (diff)
download	php-git-2c99bef442d71a455628628e932daf26aaec8a46.tar.gz