zeev Sun Jan 19 16:37:41 2003 EDT
Modified files:
/php4 acinclude.m4 configure.in
Log:
relabel
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.224 php4/acinclude.m4:1.225
--- php4/acinclude.m4:1.224 Fri Jan 3 17:05:12 2003
+++ php4/acinclude.m4 Sun Jan 19 16:37:40 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.224 2003/01/03 22:05:12 alexwaugh Exp $
+dnl $Id: acinclude.m4,v 1.225 2003/01/19 21:37:40 zeev Exp $
dnl
dnl This file contains local autoconf functions.
@@ -777,7 +777,7 @@
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
Index: php4/configure.in
diff -u php4/configure.in:1.413 php4/configure.in:1.414
--- php4/configure.in:1.413 Thu Jan 9 11:37:45 2003
+++ php4/configure.in Sun Jan 19 16:37:40 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.413 2003/01/09 16:37:45 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.414 2003/01/19 21:37:40 zeev Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -237,7 +237,7 @@
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_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 @@
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 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
