cvs: php4 / configure.in

andi Thu Aug 31 16:43:51 2000 EDT Modified files: /php4 configure.in Log: - 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. Index: php4/configure.in diff -u php4/configure.in:1.172 php4/configure.in:1.173 --- php4/configure.in:1.172 Tue Aug 29 12:44:44 2000 +++ php4/configure.in Thu Aug 31 16:43:51 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.172 2000/08/29 19:44:44 andrei Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.173 2000/08/31 23:43:51 andi Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -611,11 +611,12 @@ 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 @@ 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"