diff options
| author | Zeev Suraski <zeev@php.net> | 2003-01-19 21:37:40 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2003-01-19 21:37:40 +0000 |
| commit | 4c8473d6199147e4f66f6af4a0db533f1ba4aa70 (patch) | |
| tree | 021d8b1c3456b26a7a4346ab13ab7b74a4275cd8 | |
| parent | dce8267f3556b3108971458b6f04e4bd306d3829 (diff) | |
| download | php-git-4c8473d6199147e4f66f6af4a0db533f1ba4aa70.tar.gz | |
relabel
| -rw-r--r-- | Zend/Zend.m4 | 12 | ||||
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | configure.in | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index edd304e5e5..1f3aec237a 100644 --- 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 2e0acaef08..ce47135199 100644 --- 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 5652768016..ab8159a8ca 100644 --- 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 |