- remove extra CPPFLAGS from top-level Makefile

- HSREGEX defaults to what the user wants, but can be changed now internally

4 files changed, 7 insertions, 7 deletions

diff --git a/Makefile.am b/Makefile.am
index 425b9e9b3c..0c93b2beb4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,6 @@ AUTOMAKE_OPTIONS = foreign
 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
diff --git a/acinclude.m4 b/acinclude.m4
index a5bfacaf6d..2364ee0416 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -147,6 +147,8 @@ AC_DEFUN(AC_CHECK_CC_OPTION,[
 ])
 
 AC_DEFUN(PHP_HSREGEX,[
+
+test -z "$HSREGEX" && HSREGEX="$WANT_HSREGEX"		
 AC_MSG_CHECKING(whether to use bundled regex library)
 AC_MSG_RESULT($HSREGEX)
 
diff --git a/configure.in b/configure.in
index 2219d998ba..56ebd3f625 100644
--- a/configure.in
+++ b/configure.in
@@ -641,7 +641,7 @@ AC_ARG_ENABLE(thread-safety,
     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)
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index cde845c2e8..ce9a4682ef 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -127,12 +127,12 @@ AC_ARG_WITH(system-regex,
 [  --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