Get rid of some config.h.stubs. Comments are placed into AC_DEFINE()

diff --git a/sapi/aolserver/config.h.stub b/sapi/aolserver/config.h.stub
deleted file mode 100644 (file)
index 76f883d..0000000
--- a/sapi/aolserver/config.h.stub
+++ /dev/null
@@ -1 +0,0 @@
-#undef HAVE_AOLSERVER

diff --git a/sapi/aolserver/config.m4 b/sapi/aolserver/config.m4
index 64a77c4ff07a2e7cccaac869a0837e86c3a2e08f..e38fa3796ac8279916351f1ec76a77c8201dd5d6 100644 (file)
--- a/sapi/aolserver/config.m4
+++ b/sapi/aolserver/config.m4
@@ -11,7 +11,7 @@ AC_ARG_WITH(aolserver,
        PHP_BUILD_THREAD_SAFE
        NS_DIR=$withval
        AC_ADD_INCLUDE($NS_DIR/include)
-       AC_DEFINE(HAVE_AOLSERVER)
+       AC_DEFINE(HAVE_AOLSERVER,1,[Whether you have AOLserver])
        PHP_SAPI=aolserver
        PHP_BUILD_SHARED
        INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $NS_DIR/root/bin/"

diff --git a/sapi/apache/config.h.stub b/sapi/apache/config.h.stub
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/sapi/cgi/config.h.in b/sapi/cgi/config.h.in
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/sapi/phttpd/config.h.stub b/sapi/phttpd/config.h.stub
deleted file mode 100644 (file)
index 56c1d73..0000000
--- a/sapi/phttpd/config.h.stub
+++ /dev/null
@@ -1 +0,0 @@
-#undef HAVE_PHTTPD

diff --git a/sapi/phttpd/config.m4 b/sapi/phttpd/config.m4
index 299e69225cbae5e2fe8f1a9370c4406f6f54bdee..21dbe1fb313f330652bd80b270bfa2a694e9139c 100644 (file)
--- a/sapi/phttpd/config.m4
+++ b/sapi/phttpd/config.m4
@@ -11,7 +11,7 @@ AC_ARG_WITH(phttpd,
        PHP_BUILD_THREAD_SAFE
        PHTTPD_DIR=$withval
        AC_ADD_INCLUDE($PHTTPD_DIR/include)
-       AC_DEFINE(HAVE_PHTTPD)
+       AC_DEFINE(HAVE_PHTTPD,1,[Whether you have phttpd])
        PHP_SAPI=phttpd
        PHP_BUILD_SHARED
        INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $PHTTPD_DIR/modules/"

diff --git a/sapi/roxen/config.h.stub b/sapi/roxen/config.h.stub
deleted file mode 100644 (file)
index 4128f31..0000000
--- a/sapi/roxen/config.h.stub
+++ /dev/null
@@ -1,12 +0,0 @@
-
-/* Define this if you want to build the Roxen PHP module
- * It is currently VERY EXPERIMENTAL and not finished.
- */
-#undef HAVE_ROXEN
-
-
-/* Comment to use the Roxen "serializing" instead of PHP's ZTS.
- * It seems like the Roxen PHP-global mutex lock works better,
- * performance wise.
- */
-#undef ROXEN_USE_ZTS

diff --git a/sapi/roxen/config.m4 b/sapi/roxen/config.m4
index 994e96ea8f5b20f32da14c78d948945cce9f7306..2fc19e3f586ad5574d807eea537aeae04eac239b 100644 (file)
--- a/sapi/roxen/config.m4
+++ b/sapi/roxen/config.m4
@@ -26,7 +26,7 @@ AC_ARG_WITH(roxen,
                AC_MSG_ERROR(Roxen/PHP requires Pike 0.7.79 or newer)
        fi
        AC_ADD_INCLUDE($PIKE_INCLUDE_DIR)
-       AC_DEFINE(HAVE_ROXEN)
+       AC_DEFINE(HAVE_ROXEN,1,[Whether you use Roxen])
        PHP_SAPI=roxen
        PHP_BUILD_SHARED
        INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $PIKE_MODULE_DIR/PHP4.so"
@@ -47,7 +47,7 @@ if test "$RESULT" != "no" ; then
                           are normally made in a serialized mode.],
  [
        PHP_BUILD_THREAD_SAFE
-       AC_DEFINE(ROXEN_USE_ZTS)
+       AC_DEFINE(ROXEN_USE_ZTS,1,[Whether to use Roxen in ZTS mode])
        RESULT="yes
        ***   You have choosen to compile with PHP thread safety
        ***   enabled. This is not a requirement for the Roxen
@@ -60,4 +60,4 @@ fi
 dnl ## Local Variables:
 dnl ## tab-width: 4
 dnl ## End:
-       
\ No newline at end of file
+       

diff --git a/sapi/servlet/config.h.stub b/sapi/servlet/config.h.stub
deleted file mode 100644 (file)
index bd5601c..0000000
--- a/sapi/servlet/config.h.stub
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef SAPI_SERVLET
-#define SAPI_SERVLET 0
-#endif

diff --git a/sapi/servlet/config.m4 b/sapi/servlet/config.m4
index dc38d142b49ddfbf9af900dab452d6d65421f928..28c3ed1ba28c79102d776df57717e54908e102eb 100644 (file)
--- a/sapi/servlet/config.m4
+++ b/sapi/servlet/config.m4
@@ -24,7 +24,7 @@ AC_ARG_WITH(servlet,
       fi
     fi
 
-    AC_DEFINE(SAPI_SERVLET)
+    AC_DEFINE(SAPI_SERVLET, 1, [Whether you use Servlet])
     PHP_EXTENSION(servlet, "shared")
     PHP_SAPI=servlet
     PHP_BUILD_SHARED