Allow --with-apxs and --with-regex=apache

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 9aed624498b27c238e7687abeeaf70b23f3f0c05..c70a04b13d88c784cd95b44d01d7ae2587f08c7f 100644 (file)
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -16,9 +16,12 @@ AC_ARG_WITH(apxs,
                XML_INCLUDE="$APXS_INCLUDEDIR/xml"
        fi
        AC_ADD_INCLUDE($APXS_INCLUDEDIR)
-    PHP_EXTENSION(apache)
+       if test -n "`$APXS -q CFLAGS | grep USE_HSREGEX`"; then
+               APACHE_HAS_REGEX=yes
+       fi
+       PHP_EXTENSION(apache)
        PHP_SAPI=apache
-    APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED"
+       APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED"
        PHP_BUILD_SHARED
        STRONGHOLD=
        AC_DEFINE(APACHE)