diff options
author | Sascha Schumann <sas@php.net> | 2000-12-04 16:05:00 +0000 |
---|---|---|
committer | Sascha Schumann <sas@php.net> | 2000-12-04 16:05:00 +0000 |
commit | dedec6614ee1142e8f3cb2de20b7cb8ce2a65045 (patch) | |
tree | 8751f166ac7f7a23f3d7ec6ad7bad5a839646f4e | |
parent | bfe4e5bf37dfe82a315f805603cc40c9a4e3a839 (diff) | |
download | php-git-dedec6614ee1142e8f3cb2de20b7cb8ce2a65045.tar.gz |
Automatically carry over macro definitions from Apache.
We don't take everything, because apxs' CFLAGS also includes
optimization, debugging, et cetera flags.
PR: #7211
-rw-r--r-- | sapi/apache/config.m4 | 11 |
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 |