cvs: /php4 Makefile.am acinclude.m4 configure.in /php4/ext/standard config.m4

sas Sat Nov 13 08:27:49 1999 EDT Modified files: /php4 Makefile.am acinclude.m4 configure.in /php4/ext/standard config.m4 Log: - remove extra CPPFLAGS from top-level Makefile - HSREGEX defaults to what the user wants, but can be changed now internally Index: php4/Makefile.am diff -u php4/Makefile.am:1.10 php4/Makefile.am:1.11 --- php4/Makefile.am:1.10 Thu Oct 28 13:33:36 1999 +++ php4/Makefile.am Sat Nov 13 08:27:48 1999 @@ -3,8 +3,6 @@ ZEND_DIR = $(srcdir)/libzend SUBDIRS = libzend ext sapi $(TSRM_DIR) regex -CPPFLAGS = $(INCLUDES) -I$(ZEND_DIR) -I$(srcdir)/TSRM - BUILDLDFLAGS = $(EXTRA_LDFLAGS) $(LDFLAGS) phptemp_LTLIBRARIES = libphp4.la Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.37 php4/acinclude.m4:1.38 --- php4/acinclude.m4:1.37 Sat Nov 13 07:38:23 1999 +++ php4/acinclude.m4 Sat Nov 13 08:27:48 1999 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.37 1999/11/13 12:38:23 sas Exp $ +dnl $Id: acinclude.m4,v 1.38 1999/11/13 13:27:48 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -147,6 +147,8 @@ ]) AC_DEFUN(PHP_HSREGEX,[ + +test -z "$HSREGEX" && HSREGEX="$WANT_HSREGEX" AC_MSG_CHECKING(whether to use bundled regex library) AC_MSG_RESULT($HSREGEX) Index: php4/configure.in diff -u php4/configure.in:1.30 php4/configure.in:1.31 --- php4/configure.in:1.30 Sat Nov 13 07:55:47 1999 +++ php4/configure.in Sat Nov 13 08:27:48 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.30 1999/11/13 12:55:47 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.31 1999/11/13 13:27:48 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(0) @@ -641,7 +641,7 @@ TSRM_LIB='TSRM/libtsrm.la' TSRM_DIR=TSRM AC_DEFINE(ZTS) - INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" + INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM -I\$(top_srcdir)/TSRM" CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" export CPPFLAGS AC_MSG_RESULT(yes) Index: php4/ext/standard/config.m4 diff -u php4/ext/standard/config.m4:1.9 php4/ext/standard/config.m4:1.10 --- php4/ext/standard/config.m4:1.9 Fri Nov 12 15:56:29 1999 +++ php4/ext/standard/config.m4 Sat Nov 13 08:27:49 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.9 1999/11/12 20:56:29 sas Exp $ -*- sh -*- +dnl $Id: config.m4,v 1.10 1999/11/13 13:27:49 sas Exp $ -*- sh -*- divert(1) @@ -127,12 +127,12 @@ [ --with-system-regex Do not use the bundled regex library], [ if test "$withval" = "no"; then - HSREGEX=yes + WANT_HSREGEX=yes else - HSREGEX=no - fi + WANT_HSREGEX=no + fi ],[ - HSREGEX=yes + WANT_HSREGEX=yes ]) AC_CRYPT_CAP