cvs: php4 / configure.in

sas Sun Jun 4 08:34:31 2000 EDT Modified files: /php4 configure.in Log: Back out the last change by Andi which caused TSRM to be always configured. This needs to be refined. It caused breakage on several platforms. Index: php4/configure.in diff -u php4/configure.in:1.139 php4/configure.in:1.140 --- php4/configure.in:1.139 Fri Jun 2 01:51:50 2000 +++ php4/configure.in Sun Jun 4 08:34:31 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.139 2000/06/02 08:51:50 andi Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.140 2000/06/04 15:34:31 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -642,13 +642,11 @@ LIBZEND_BASIC_CHECKS LIBZEND_OTHER_CHECKS - -TSRM_LIB='TSRM/libtsrm.la' -TSRM_DIR=TSRM -INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" - if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then + TSRM_LIB='TSRM/libtsrm.la' + TSRM_DIR=TSRM AC_DEFINE(ZTS) + INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" PHP_THREAD_SAFETY=yes else PHP_THREAD_SAFETY=no @@ -656,21 +654,24 @@ if test "$abs_srcdir" != "$abs_builddir"; then INCLUDES="$INCLUDES -I\$(top_srcdir)/Zend" - INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM" + if test "$PHP_THREAD_SAFETY" = "yes"; then + INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM" + fi fi EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS" LIBS="" LDFLAGS="" - -PHP_CONFIGURE_PART(Configuring TSRM) -TSRM_BASIC_CHECKS -TSRM_OTHER_CHECKS -EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS" -EXTRA_LIBS="$EXTRA_LIBS $LIBS" -LDFLAGS="" -LIBS="" -PHP_OUTPUT(TSRM/Makefile) +if test "$PHP_THREAD_SAFETY" = "yes"; then + PHP_CONFIGURE_PART(Configuring TSRM) + TSRM_BASIC_CHECKS + TSRM_OTHER_CHECKS + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS" + EXTRA_LIBS="$EXTRA_LIBS $LIBS" + LDFLAGS="" + LIBS="" + PHP_OUTPUT(TSRM/Makefile) +fi phplibdir="pwd/modules"