- Change TSRM_OTHER macro to TSRM_THREADS as it should be only to check

  for threads

diff --git a/TSRM/configure.in b/TSRM/configure.in
index 7fedf73846ed523e3c791ab64280b24366be244c..36293b8917891bf6b1c0c527106b0310a98b09ca 100644 (file)
--- 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 3f64ebf8034eab198a309c68126bb18307ecc540..73a67ba7c8f872f985c1f0a438d7eb867415b5b9 100644 (file)
--- 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 eb42083f041bfc7fe36c376cf25a796731afacb6..74dc03bb3c800b42ea7e7c462e7b655c2d850d6b 100644 (file)
--- 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=""