From 5f3d93592049e97cc60465d068c0dad66d1cc8fc Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Sat, 2 Sep 2000 15:24:18 +0000 Subject: [PATCH] - Change TSRM_OTHER macro to TSRM_THREADS as it should be only to check for threads --- TSRM/configure.in | 2 +- TSRM/tsrm.m4 | 2 +- configure.in | 4 +++- 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="" -- 2.50.1