- Always include TSRM in PHP build. This will enable us to move virtual

- cwd to TSRM.
- BTW, if I comile with --enable-experimental-zts not from php4/ but from
- php4/cgi (ran ../configure there) then the build doesn't work also b4
- this patch.

diff --git a/configure.in b/configure.in
index c2c1a7a5aa5ff322dbcdbc3269a4d98c3d0b6784..eb42083f041bfc7fe36c376cf25a796731afacb6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -611,11 +611,12 @@ 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,1,[ ])
-  INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM"
   PHP_THREAD_SAFETY=yes
 else
   PHP_THREAD_SAFETY=no
@@ -623,24 +624,21 @@ fi
 
 if test "$abs_srcdir" != "$abs_builddir"; then
   INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend"
-  if test "$PHP_THREAD_SAFETY" = "yes"; then
-    INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM"
-  fi
+  INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM"
 fi
 
 EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
 LIBS=""
 LDFLAGS=""
-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
+
+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)
 
 
 phplibdir="`pwd`/modules"