From: Sascha Schumann <sas@php.net>
Date: Mon, 4 Dec 2000 16:05:00 +0000 (+0000)
Subject: Automatically carry over macro definitions from Apache.
X-Git-Tag: php-4.0.5RC1~1025
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dedec6614ee1142e8f3cb2de20b7cb8ce2a65045;p=php

Automatically carry over macro definitions from Apache.

We don't take everything, because apxs' CFLAGS also includes
optimization, debugging, et cetera flags.

PR: #7211
---

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 20dc9b3b0d..cd20324501 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -42,13 +42,12 @@ AC_ARG_WITH(apxs,
 	APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
 	APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
 	APXS_CFLAGS=`$APXS -q CFLAGS`
+	for flag in $APXS_CFLAGS; do
+		case $flag in
+		-D*) CPPFLAGS="$CPPFLAGS $flag";;
+		esac
+	done
 	AC_ADD_INCLUDE($APXS_INCLUDEDIR)
-	if `echo $APXS_CFLAGS|grep USE_HSREGEX>/dev/null`; then
-		APACHE_HAS_REGEX=yes
-	fi
-	if `echo $APXS_CFLAGS|grep EAPI>/dev/null`; then
-	   CPPFLAGS="$CPPFLAGS -DEAPI"
-	fi
 	PHP_SAPI=apache
 	APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED"
 	PHP_BUILD_SHARED