diff options
| author | Sascha Schumann <sas@php.net> | 2000-06-04 15:34:31 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-06-04 15:34:31 +0000 |
| commit | 950e7224ad3d027b0bab191b28ed1d84386b23f0 (patch) | |
| tree | c6bd144e1e7a489b6ca318a3570b2e37d41c95f1 | |
| parent | 5af7dff7581ac7314c57ed525d590f9709a5d432 (diff) | |
| download | php-git-950e7224ad3d027b0bab191b28ed1d84386b23f0.tar.gz | |
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.
| -rw-r--r-- | configure.in | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/configure.in b/configure.in index b52bbf44ad..d535ebe7da 100644 --- a/configure.in +++ b/configure.in @@ -642,13 +642,11 @@ PHP_CONFIGURE_PART(Configuring Zend) 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 @@ fi 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" |