summaryrefslogtreecommitdiff
path: root/sapi/roxen/config.m4
diff options
context:
space:
mode:
authorDavid Hedbor <neotron@php.net>1999-11-25 00:28:19 +0000
committerDavid Hedbor <neotron@php.net>1999-11-25 00:28:19 +0000
commit353686c9c594edfdd880cdab25ed4ed2a9eb33b1 (patch)
tree9f897a30ec61f2a291c8cf6618b31ccfd1cd4055 /sapi/roxen/config.m4
parent4b8b9705e47cf796e2a7707430499e578e9162e1 (diff)
downloadphp-git-353686c9c594edfdd880cdab25ed4ed2a9eb33b1.tar.gz
Now ZTS can be used. Unless --enable-roxen-zts is specified at the
configure line the default process global Roxen PHP lock will be used. In tests this was a lot faster for some reason and until the reasons are figured out, it's recommended to use the non-thead-safe version. Cvs: ----------------------------------------------------------------------
Diffstat (limited to 'sapi/roxen/config.m4')
-rw-r--r--sapi/roxen/config.m427
1 files changed, 24 insertions, 3 deletions
diff --git a/sapi/roxen/config.m4 b/sapi/roxen/config.m4
index 555d699cc2..b2425b2156 100644
--- a/sapi/roxen/config.m4
+++ b/sapi/roxen/config.m4
@@ -2,8 +2,9 @@ dnl ## $Id$ -*- sh -*-
RESULT=no
AC_MSG_CHECKING(for Roxen/Pike support)
-AC_ARG_WITH(roxen,
-[ --with-roxen=DIR],
+AC_ARG_WITH(roxen,
+[ --with-roxen=DIR Build PHP as a Pike module. DIR is the base Roxen
+ directory, normally /usr/local/roxen/server.],
[
if test ! -d $withval ; then
AC_MSG_ERROR(You did not specify a directory)
@@ -30,12 +31,32 @@ AC_ARG_WITH(roxen,
PHP_BUILD_SHARED
INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $PIKE_MODULE_DIR/PHP4.so"
RESULT="yes
- Pike binary user: $PIKE
+ Pike binary used: $PIKE
Pike include dir: $PIKE_INCLUDE_DIR
Pike module directory: $PIKE_MODULE_DIR"
])
AC_MSG_RESULT($RESULT)
+if test "$RESULT" != "no" ; then
+ RESULT=no
+ AC_MSG_CHECKING(if Roxen should use ZTS)
+ AC_ARG_ENABLE(roxen-zts,
+ [ --enable-roxen-zts Build the Roxen module using Zend Thread Safety.
+ This is not required to run the module in a threaded
+ Roxen and it doesn't improve performance. PHP calls
+ are normally made in a serialized mode.],
+ [
+ PHP_BUILD_THREAD_SAFE
+ AC_DEFINE(ROXEN_USE_ZTS)
+ RESULT="yes
+ *** You have choosen to compile with PHP thread safety
+ *** enabled. This is not a requirement for the Roxen
+ *** PHP module, even if Roxen runs in multi-threaded mode.
+ *** It will as a matter of fact make performance worse."
+
+ ])
+ AC_MSG_RESULT($RESULT)
+fi
dnl ## Local Variables:
dnl ## tab-width: 4
dnl ## End: