summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-12-21 00:15:51 +0000
committerSascha Schumann <sas@php.net>1999-12-21 00:15:51 +0000
commit2e07f02451c81d17bf1c0f8cf014283fc1e8af7e (patch)
treed7ccc72ef79b3e4af0cd36015901d1fa9ad6112b
parentefeadf086b48804f8f3a2cccd0c22fc5fa9617c7 (diff)
downloadphp-git-2e07f02451c81d17bf1c0f8cf014283fc1e8af7e.tar.gz
Propagate ZTS setting correctly
-rw-r--r--acinclude.m42
-rw-r--r--configure.in3
2 files changed, 2 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index aec18cfa50..221d830337 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -16,7 +16,7 @@ dnl
dnl PHP_BUILD_THREAD_SAFE
dnl
AC_DEFUN(PHP_BUILD_THREAD_SAFE,[
- PHP_THREAD_SAFETY=yes
+ enable_experimental_zts=yes
])
dnl
diff --git a/configure.in b/configure.in
index 3207f2b828..de278c2629 100644
--- a/configure.in
+++ b/configure.in
@@ -693,8 +693,7 @@ CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT"
LIBZEND_BASIC_CHECKS
LIBZEND_OTHER_CHECKS
-
-if test "$PHP_THREAD_SAFETY" = "yes" || test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
+if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
TSRM_LIB='TSRM/libtsrm.la'
TSRM_DIR=TSRM
AC_DEFINE(ZTS)