relabel

diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index edd304e5e50f2cd408dd05f0c3337ec96d45160a..1f3aec237a2df7680df338baff7ef9e13d4bae64 100644 (file)
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -107,11 +107,11 @@ AC_ARG_ENABLE(debug,
 
 AC_DEFUN(LIBZEND_OTHER_CHECKS,[
 
-AC_ARG_ENABLE(experimental-zts,
-[  --enable-experimental-zts   This will most likely break your build],[
-  ZEND_EXPERIMENTAL_ZTS=$enableval
+AC_ARG_ENABLE(maintainer-zts,
+[  --enable-maintainer-zts   Enable thread safety - for code maintainers only],[
+  ZEND_MAINTAINER_ZTS=$enableval
 ],[
-  ZEND_EXPERIMENTAL_ZTS=no
+  ZEND_MAINTAINER_ZTS=no
 ])  
 
 AC_ARG_ENABLE(inline-optimization,
@@ -130,7 +130,7 @@ AC_ARG_ENABLE(memory-limit,
 ])
 
 AC_MSG_CHECKING(whether to enable thread-safety)
-AC_MSG_RESULT($ZEND_EXPERIMENTAL_ZTS)
+AC_MSG_RESULT($ZEND_MAINTAINER_ZTS)
 
 AC_MSG_CHECKING(whether to enable inline optimization for GCC)
 AC_MSG_RESULT($ZEND_INLINE_OPTIMIZATION)
@@ -156,7 +156,7 @@ fi
 
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 
-if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
+if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
   AC_DEFINE(ZTS,1,[ ])
   CFLAGS="$CFLAGS -DZTS"
   LIBZEND_CPLUSPLUS_CHECKS

diff --git a/acinclude.m4 b/acinclude.m4
index 2e0acaef08c14dd49d41e297b03f381e2d9ab5ec..ce4713519936e12c9f03ca00cdbe3af26bf48816 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -777,7 +777,7 @@ dnl
 dnl PHP_BUILD_THREAD_SAFE
 dnl
 AC_DEFUN([PHP_BUILD_THREAD_SAFE],[
-  enable_experimental_zts=yes
+  enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
     AC_MSG_ERROR([ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads.])
   fi

diff --git a/configure.in b/configure.in
index 56527680163b563eb4602605d84715ea4220399e..ab8159a8cad2564c919df6a5480669e3e6317c6d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -237,7 +237,7 @@ dnl Show which main SAPI was selected
 AC_MSG_CHECKING([for chosen SAPI module])
 AC_MSG_RESULT([$PHP_SAPI])
 
-if test "$enable_experimental_zts" = "yes"; then
+if test "$enable_maintainer_zts" = "yes"; then
   PTHREADS_ASSIGN_VARS
   PTHREADS_FLAGS
 fi
@@ -836,7 +836,7 @@ TSRM_LIB='TSRM/libtsrm.la'
 TSRM_DIR=TSRM
 CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/TSRM"
 
-if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
+if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
   AC_DEFINE(ZTS,1,[ ])
   PHP_THREAD_SAFETY=yes
 else
@@ -898,7 +898,7 @@ if test -z "$EXTENSION_DIR"; then
     else
       part1=no-debug
     fi
-    if test "$enable_experimental_zts" = "yes"; then
+    if test "$enable_maintainer_zts" = "yes"; then
       part2=zts
     else
       part2=non-zts
@@ -906,7 +906,7 @@ if test -z "$EXTENSION_DIR"; then
     extbasedir=$part1-$part2-$extbasedir
     EXTENSION_DIR=$libdir/extensions/$extbasedir
   else
-    if test "$enable_experimental_zts" = "yes"; then
+    if test "$enable_maintainer_zts" = "yes"; then
       extbasedir=$extbasedir-zts
     fi