summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2000-12-04 16:14:09 +0000
committerSascha Schumann <sas@php.net>2000-12-04 16:14:09 +0000
commit9b4e521b9c743142a257885b90bdf6399b5b18a3 (patch)
tree809c33fed0a4157b70c72320ac3d57bc085a2f4b
parent449ddbccb14469638cf2933dcfff0a5ae2458da1 (diff)
downloadphp-git-9b4e521b9c743142a257885b90bdf6399b5b18a3.tar.gz
Merged with HEAD, 1.35
-rw-r--r--sapi/apache/config.m411
1 files changed, 5 insertions, 6 deletions
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