Define EAPI, if Apache uses EAPI

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index c172bdf37b4f205939b233adea5fa38c4a017bd0..ab5ea404da5ba3e6307ed3a463d5bead2a34af27 100644 (file)
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -22,10 +22,14 @@ AC_ARG_WITH(apxs,
        fi
        APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
        APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
+       APXS_CFLAGS=`$APXS -q CFLAGS`
        AC_ADD_INCLUDE($APXS_INCLUDEDIR)
-       if test -n "`$APXS -q CFLAGS | grep USE_HSREGEX`"; then
+       if test -n "`echo $APXS_CFLAGS | grep USE_HSREGEX >/dev/null`"; then
                APACHE_HAS_REGEX=yes
        fi
+       if test -n "`echo $APXS_CFLAGS | grep EAPI >/dev/null`"; then
+          CPPFLAGS="$CPPFLAGS -DUSE_EAPI"
+       fi
        PHP_SAPI=apache
        APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED"
        PHP_BUILD_SHARED