cvs: /php4 acinclude.m4 configure.in
| From: | Sascha Schumann | Date: | Tue, 21 Dec 1999 00:16:22 +0000 |
| Subject: | cvs: /php4 acinclude.m4 configure.in | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-8268@lists.php.net to get a copy of this message | ||
sas Mon Dec 20 19:16:22 1999 EDT
Modified files:
/php4 acinclude.m4 configure.in
Log:
Propagate ZTS setting correctly
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.51 php4/acinclude.m4:1.52
--- php4/acinclude.m4:1.51 Mon Dec 6 10:31:59 1999
+++ php4/acinclude.m4 Mon Dec 20 19:15:51 1999
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.51 1999/12/06 15:31:59 sas Exp $
+dnl $Id: acinclude.m4,v 1.52 1999/12/21 00:15:51 sas Exp $
dnl
dnl This file contains local autoconf functions.
@@ -16,7 +16,7 @@
dnl PHP_BUILD_THREAD_SAFE
dnl
AC_DEFUN(PHP_BUILD_THREAD_SAFE,[
- PHP_THREAD_SAFETY=yes
+ enable_experimental_zts=yes
])
dnl
Index: php4/configure.in
diff -u php4/configure.in:1.73 php4/configure.in:1.74
--- php4/configure.in:1.73 Mon Dec 20 03:10:38 1999
+++ php4/configure.in Mon Dec 20 19:15:51 1999
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.73 1999/12/20 08:10:38 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.74 1999/12/21 00:15:51 sas Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(0)
@@ -693,8 +693,7 @@
LIBZEND_BASIC_CHECKS
LIBZEND_OTHER_CHECKS
-
-if test "$PHP_THREAD_SAFETY" = "yes" || test "$ZEND_EXPERIMENTAL_ZTS"
= "yes"; then
+if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
TSRM_LIB='TSRM/libtsrm.la'
TSRM_DIR=TSRM
AC_DEFINE(ZTS)