summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2000-09-02 15:24:18 +0000
committerAndi Gutmans <andi@php.net>2000-09-02 15:24:18 +0000
commit5f3d93592049e97cc60465d068c0dad66d1cc8fc (patch)
tree332af1f245a9a143d209c8682578b59c18bde474
parenta8656beb34cf29c37743aaa6bae9ac19ee291821 (diff)
downloadphp-git-5f3d93592049e97cc60465d068c0dad66d1cc8fc.tar.gz
- Change TSRM_OTHER macro to TSRM_THREADS as it should be only to check
for threads
-rw-r--r--TSRM/configure.in2
-rw-r--r--TSRM/tsrm.m42
-rw-r--r--configure.in4
3 files changed, 5 insertions, 3 deletions
diff --git a/TSRM/configure.in b/TSRM/configure.in
index 7fedf73846..36293b8917 100644
--- a/TSRM/configure.in
+++ b/TSRM/configure.in
@@ -10,7 +10,7 @@ AM_CONFIG_HEADER(tsrm_config.h)
sinclude(tsrm.m4)
TSRM_BASIC_CHECKS
-TSRM_OTHER_CHECKS
+TSRM_THREADS_CHECKS
AM_PROG_LIBTOOL
if test "$enable_debug" != "yes"; then
diff --git a/TSRM/tsrm.m4 b/TSRM/tsrm.m4
index 3f64ebf803..73a67ba7c8 100644
--- a/TSRM/tsrm.m4
+++ b/TSRM/tsrm.m4
@@ -68,7 +68,7 @@ AC_MSG_RESULT(yes)
])
-AC_DEFUN(TSRM_OTHER_CHECKS,[
+AC_DEFUN(TSRM_THREADS_CHECKS,[
dnl For the thread implementations, we always use --with-*
dnl to maintain consistency
diff --git a/configure.in b/configure.in
index eb42083f04..74dc03bb3c 100644
--- a/configure.in
+++ b/configure.in
@@ -633,7 +633,9 @@ LDFLAGS=""
PHP_CONFIGURE_PART(Configuring TSRM)
TSRM_BASIC_CHECKS
-TSRM_OTHER_CHECKS
+if test "$PHP_THREAD_SAFETY" = "yes"; then
+TSRM_THREADS_CHECKS
+fi
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
EXTRA_LIBS="$EXTRA_LIBS $LIBS"
LDFLAGS=""