- add PHP_BUILD_THREAD_SAFE

- move #undef HAVE_AOLSERVER into its own config.h.stub

diff --git a/acconfig.h.in b/acconfig.h.in
index a35e2e4a1bc2131b974efae4b65a4c9f105b7126..c8e35458f83ad26845c62ba3dd6ec8598c6e56de 100644 (file)
--- a/acconfig.h.in
+++ b/acconfig.h.in
@@ -4,8 +4,6 @@
 #undef PACKAGE
 #undef VERSION
 
-#undef HAVE_AOLSERVER
-
 #undef HAVE_STRUCT_FLOCK
 #undef HAVE_TM_GMTOFF
 

diff --git a/acinclude.m4 b/acinclude.m4
index 802901c693573754f626ddc688d423728875b800..f32c57cf4d701241fe2560e8163384c50af15389 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -12,6 +12,14 @@ AC_DEFUN(PHP_SET_SYM_FILE,
   PHP_SYM_FILE="$1"
 ])
 
+dnl
+dnl PHP_BUILD_THREAD_SAFE
+dbl
+AC_DEFUN(PHP_BUILD_THREAD_SAFE,[
+  enable_thread_safety=yes
+  passthru="$passthru --enable-thread-safety"
+])
+
 dnl
 dnl PHP_BUILD_SHARED
 dnl

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

diff --git a/sapi/aolserver/config.m4 b/sapi/aolserver/config.m4
index 9f2cb75379996cfca14949ba8c5358bbaf40e213..64a77c4ff07a2e7cccaac869a0837e86c3a2e08f 100644 (file)
--- a/sapi/aolserver/config.m4
+++ b/sapi/aolserver/config.m4
@@ -8,8 +8,7 @@ AC_ARG_WITH(aolserver,
        if test ! -d $withval ; then
                AC_MSG_ERROR(You did not specify a directory)
        fi
-       enable_thread_safety=yes
-       passthru="$passthru --enable-thread-safety"
+       PHP_BUILD_THREAD_SAFE
        NS_DIR=$withval
        AC_ADD_INCLUDE($NS_DIR/include)
        AC_DEFINE(HAVE_AOLSERVER)