cvs: /php4 acinclude.m4 configure.in /php4/ext/db config.m4 /php4/ext/informix config.m4 /php4/ext/standard config.m4

sas Thu May 4 02:42:27 2000 EDT Modified files: /php4 acinclude.m4 configure.in /php4/ext/db config.m4 /php4/ext/informix config.m4 /php4/ext/standard config.m4 Log: Determine first whether we will use ZTS mode or not. This is important, because the system checks will yield different results depending on whether POSIX threads are enabled or not. We also use PTHREADS_CFLAGS only in ZTS mode now. Using these flags in non-ZTS mode causes complete build failures on some platforms (i.e. FreeBSD 2.2.x). This will cause harmless warnings on some platforms (i.e. Solaris 2). Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.76 php4/acinclude.m4:1.77 --- php4/acinclude.m4:1.76 Tue May 2 13:56:02 2000 +++ php4/acinclude.m4 Thu May 4 02:42:26 2000 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.76 2000/05/02 20:56:02 sas Exp $ +dnl $Id: acinclude.m4,v 1.77 2000/05/04 09:42:26 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -260,6 +260,9 @@ dnl AC_DEFUN(PHP_BUILD_THREAD_SAFE,[ enable_experimental_zts=yes + if test "$pthreads_working" != "yes"; then + AC_MSG_ERROR(ZTS currently requires working POSIX threads. Your system does not support this.) + fi ]) dnl Index: php4/configure.in diff -u php4/configure.in:1.116 php4/configure.in:1.117 --- php4/configure.in:1.116 Tue May 2 07:46:20 2000 +++ php4/configure.in Thu May 4 02:42:27 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.116 2000/05/02 14:46:20 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.117 2000/05/04 09:42:27 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -48,10 +48,6 @@ dnl ## Diversion 5 is the last one. Here we generate files and clean up. -divert(2) - -PHP_CONFIGURE_PART(Running system checks) - dnl ## This is where the version number is changed from now on! AM_INIT_AUTOMAKE(php, 4.0RC2-dev) @@ -74,12 +70,6 @@ dnl We want this one before the checks, so the checks can modify CFLAGS. test -z "$CFLAGS" && auto_cflags=1 -dnl ## If we're using cc on HP-UX, add -Ae -D_HPUX_SOURCE [obsolete] -dnl ## if test -n "$auto_cflags" && test "uname -s 2>/dev/null" = "HP-UX" -dnl ## then -dnl ## test -n "$GCC" || CFLAGS="-Ae $CFLAGS -D_HPUX_SOURCE" -dnl ## fi - dnl Checks for programs. AC_PROG_YACC if test "$YACC" != "bison -y"; then @@ -95,11 +85,8 @@ AC_MSG_RESULT($1.$2 (ok)) fi -dnl ## there has to be a better way... -dnl ## OLDLIBS=$LIBS; LIBS="" AC_PROG_CC AC_AIX -dnl ## LIBS=$OLDLIBS AM_PROG_CC_STDC @@ -121,6 +108,35 @@ sinclude(Zend/Zend.m4) sinclude(TSRM/tsrm.m4) +divert(2) + +PTHREADS_CHECK + +PHP_SAPI=cgi +PHP_BUILD_PROGRAM +dnl paths to the targets relative to the build directory +SAPI_PROGRAM=php +dnl on HP-UX, the extension is .sl. Need to improve this +SAPI_SHARED=libs/libphp4.so +SAPI_STATIC=libs/libphp4.a + +PHP_CONFIGURE_PART(Configuring SAPI modules) + +esyscmd(./scripts/config-stubs sapi) + +AC_MSG_CHECKING(for chosen SAPI module) +AC_MSG_RESULT($PHP_SAPI) + +if test "$enable_experimental_zts" = "yes"; then + PTHREADS_ASSIGN_VARS + PTHREADS_FLAGS +fi + +divert(3) + +PHP_CONFIGURE_PART(Running system checks) + + dnl check for -R, etc. switch AC_MSG_CHECKING(whether compiler supports -R) AC_CACHE_VAL(php_cv_cc_dashr,[ @@ -365,7 +381,7 @@ AC_DEFINE(in_addr_t, u_int) fi -divert(3) +divert(4) @@ -539,23 +555,8 @@ PEAR_DIR=pear fi - -PHP_SAPI=cgi -PHP_BUILD_PROGRAM -dnl paths to the targets relative to the build directory -SAPI_PROGRAM=php -dnl on HP-UX, the extension is .sl. Need to improve this -SAPI_SHARED=libs/libphp4.so -SAPI_STATIC=libs/libphp4.a - -PHP_CONFIGURE_PART(Configuring SAPI modules) - -esyscmd(./scripts/config-stubs sapi) - -AC_MSG_CHECKING(for chosen SAPI module) -AC_MSG_RESULT($PHP_SAPI) -divert(4) +divert(5) PHP_CONFIGURE_PART(Configuring extensions) @@ -581,7 +582,7 @@ fi fi -divert(5) +divert(6) enable_shared=yes enable_static=yes @@ -604,8 +605,6 @@ fi PHP_REGEX - -PTHREADS_FLAGS PHP_CONFIGURE_PART(Configuring Zend) LIBZEND_BASIC_CHECKS Index: php4/ext/db/config.m4 diff -u php4/ext/db/config.m4:1.7 php4/ext/db/config.m4:1.8 --- php4/ext/db/config.m4:1.7 Wed Dec 29 20:51:59 1999 +++ php4/ext/db/config.m4 Thu May 4 02:42:27 2000 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.7 1999/12/30 04:51:59 sas Exp $ +dnl $Id: config.m4,v 1.8 2000/05/04 09:42:27 sas Exp $ dnl config.m4 for extension db dnl don't forget to call PHP_EXTENSION(db) -divert(2)dnl +divert(3)dnl AC_CHECK_HEADERS(db1/ndbm.h) @@ -27,7 +27,7 @@ AC_PREFERRED_DB_LIB -divert(4)dnl +divert(5)dnl if test "$DBM_LIB" = "-lgdbm"; then AC_CHECK_HEADER(gdbm.h, [ GDBM_INCLUDE="" ], [ Index: php4/ext/informix/config.m4 diff -u php4/ext/informix/config.m4:1.14 php4/ext/informix/config.m4:1.15 --- php4/ext/informix/config.m4:1.14 Fri Feb 25 19:20:50 2000 +++ php4/ext/informix/config.m4 Thu May 4 02:42:27 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.14 2000/02/26 03:20:50 zeev Exp $ +dnl $Id: config.m4,v 1.15 2000/05/04 09:42:27 sas Exp $ PHPIFXLIB=ext/informix/libphp_ifx.a @@ -100,7 +100,7 @@ PHP_SUBST(INFORMIXDIR) PHP_SUBST(IFX_LIBS) -divert(6)dnl +divert(7)dnl dnl Warn if Informix support was requested but environment is not set up correctly. if test "$INFORMIX_WARNING" != ""; then Index: php4/ext/standard/config.m4 diff -u php4/ext/standard/config.m4:1.19 php4/ext/standard/config.m4:1.20 --- php4/ext/standard/config.m4:1.19 Sun Apr 16 08:44:04 2000 +++ php4/ext/standard/config.m4 Thu May 4 02:42:27 2000 @@ -1,6 +1,6 @@ -dnl $Id: config.m4,v 1.19 2000/04/16 15:44:04 rasmus Exp $ -*- sh -*- +dnl $Id: config.m4,v 1.20 2000/05/04 09:42:27 sas Exp $ -*- sh -*- -divert(2)dnl +divert(3)dnl dnl dnl Check for crypt() capabilities @@ -133,7 +133,7 @@ AC_CHECK_FUNCS(getcwd) AC_CHECK_FUNCS(getwd) -divert(4)dnl +divert(5)dnl AC_ARG_WITH(regex, [ --with-regex=TYPE regex library type: system, apache, php],