cvs: /php4 acinclude.m4 configure.in

sas Sat Nov 27 06:33:44 1999 EDT Modified files: /php4 acinclude.m4 configure.in Log: Add --enable-experimental-zts Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.43 php4/acinclude.m4:1.44 --- php4/acinclude.m4:1.43 Wed Nov 24 04:49:30 1999 +++ php4/acinclude.m4 Sat Nov 27 06:33:13 1999 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.43 1999/11/24 09:49:30 thies Exp $ +dnl $Id: acinclude.m4,v 1.44 1999/11/27 11:33:13 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -16,8 +16,7 @@ dnl PHP_BUILD_THREAD_SAFE dnl AC_DEFUN(PHP_BUILD_THREAD_SAFE,[ - enable_thread_safety=yes - passthru="$passthru --enable-thread-safety" + PHP_THREAD_SAFETY=yes ]) dnl Index: php4/configure.in diff -u php4/configure.in:1.43 php4/configure.in:1.44 --- php4/configure.in:1.43 Fri Nov 26 16:45:57 1999 +++ php4/configure.in Sat Nov 27 06:33:13 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.43 1999/11/26 21:45:57 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.44 1999/11/27 11:33:13 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(0) @@ -571,7 +571,15 @@ ]) AC_MSG_RESULT($DMALLOC_RESULT) -dnl ## This is the default server API. +AC_MSG_CHECKING(whether to enable experimental ZTS mode) +AC_ARG_ENABLE(experimental-zts, +[ --enable-experimental-zts This will most likely break your build.],[ + PHP_EXPERIMENTAL_ZTS=$enableval +],[ + PHP_EXPERIMENTAL_ZTS=no +]) +AC_MSG_RESULT($PHP_EXPERIMENTAL_ZTS) + PHP_SAPI=cgi PHP_BUILD_PROGRAM dnl paths to the targets relative to the build directory @@ -591,19 +599,23 @@ PHP_OUTPUT(sapi/$PHP_SAPI/Makefile) -RESULT=no AC_MSG_CHECKING(whether to enable versioning) AC_ARG_ENABLE(versioning, [ --enable-versioning Export only required symbols. - See INSTALL for more information], -[ + See INSTALL for more information],[ + PHP_VERSIONING=$enableval +],[ + PHP_VERSIONING=no +]) +AC_MSG_RESULT($PHP_VERSIONING) + +if test "$PHP_VERSIONING" = "yes"; then test -z "$PHP_SYM_FILE" && PHP_SYM_FILE="$abs_srcdir/sapi/$PHP_SAPI/php.sym" - if test "$enableval" = "yes" && test -f "$PHP_SYM_FILE"; then + if test -f "$PHP_SYM_FILE"; then EXTRA_LDFLAGS="-export-symbols $PHP_SYM_FILE" - RESULT="yes" fi -]) -AC_MSG_RESULT($RESULT) +fi + divert(4) @@ -639,22 +651,26 @@ 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) + + CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS" export CPPFLAGS -if test "$enable_thread_safety" = "yes"; then +if test "$PHP_THREAD_SAFETY" = "yes" || test "$PHP_EXPERIMENTAL_ZTS" = "yes"; then + passthru="$passthru --enable-thread-safety" TSRM_LIB='TSRM/libtsrm.la' TSRM_DIR=TSRM AC_DEFINE(ZTS) CPPFLAGS="$CPPFLAGS -D_REENTRANT" INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM -I\$(top_srcdir)/TSRM" -else - enable_thread_safety=no + PHP_THREAD_SAFETY=yes +else + PHP_THREAD_SAFETY=no fi -AC_MSG_RESULT($enable_thread_safety) +AC_MSG_CHECKING(whether to build PHP thread-safe) +AC_MSG_RESULT($PHP_THREAD_SAFETY) AC_SUBST(TSRM_DIR) AC_SUBST(TSRM_LIB)