cvs: php4(php_4_0_4) /sapi/apache config.m4
| From: | Sascha Schumann | Date: | Mon, 04 Dec 2000 16:14:09 +0000 |
| Subject: | cvs: php4(php_4_0_4) /sapi/apache config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2932@lists.php.net to get a copy of this message | ||
sas Mon Dec 4 08:14:09 2000 EDT
Branch: php_4_0_4
Modified files:
/php4/sapi/apache config.m4
Log:
Merged with HEAD, 1.35
Index: php4/sapi/apache/config.m4
diff -u php4/sapi/apache/config.m4:1.34 php4/sapi/apache/config.m4:1.34.2.1
--- php4/sapi/apache/config.m4:1.34 Mon Nov 13 04:43:44 2000
+++ php4/sapi/apache/config.m4 Mon Dec 4 08:14:09 2000
@@ -42,13 +42,12 @@
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