Remove --enable-thread-safety. There is no reason people should be able

to set this manually; most likely, they will burn themselves by using it.

diff --git a/configure.in b/configure.in
index 71438a4347cd34dee657535ad5ec75cfae488abd..30cad7e1cc9fc35e2e2796acc45786d707d66183 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -634,24 +634,20 @@ dnl If we are using gcc and the user has not specified CFLAGS, add -O2.
 test -n "$auto_cflags" && test -n "$GCC" && CFLAGS="$CFLAGS -O2"
 
 AC_MSG_CHECKING(whether to build PHP thread-safe)
-AC_ARG_ENABLE(thread-safety,
-[  --enable-thread-safety  Whether to build PHP thread-safe.],[
-  if test "$enableval" = "yes"; then
-    TSRM_LIB='TSRM/libtsrm.la'
-    TSRM_DIR=TSRM
-    AC_DEFINE(ZTS)
-    INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM -I\$(top_srcdir)/TSRM"
-    CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
-    export CPPFLAGS
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
-  fi
-],[
-  TSRM_DIR=""
-  TSRM_LIB=""
-  AC_MSG_RESULT(no)
-])
+
+if test "$enable_thread_safety" = "yes"; then
+  TSRM_LIB='TSRM/libtsrm.la'
+  TSRM_DIR=TSRM
+  AC_DEFINE(ZTS)
+  INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM -I\$(top_srcdir)/TSRM"
+  CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
+  export CPPFLAGS
+else 
+  enable_thread_safety=no
+fi
+
+AC_MSG_RESULT($enable_thread_safety)
+
 AC_SUBST(TSRM_DIR)
 AC_SUBST(TSRM_LIB)