X-Git-Url: http://git.home-dn.net/?p=manu%2Fsuphp.git;a=blobdiff_plain;f=configure.ac;h=65725a68cc5a6df41518b8802d1e9a487726caf0;hp=dbb9f9f00c160eb2a326c36c72e3ad2da9e9862f;hb=e522833716b528c5c704dd8a858b6ebbb299f106;hpb=59c5bff8d9aef402c868519d13398ba4eb2dddb7

diff --git a/configure.ac b/configure.ac
index dbb9f9f..65725a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ if test -n "$APXS"; then
                     | cut -f2 -d"/" \
                     | cut -f1 -d" "`
     major_version=`echo $APACHE_VERSION|cut -f1,2 -d.`
-    if test "$major_version" = "2.0"; then
+    if test "$major_version" = "2.0" -o "$major_version" = "2.2"; then
       APACHE_VERSION_2=true
       APACHE_VERSION_1_3=false
     else
@@ -101,6 +101,8 @@ dnl For Apache 2.x APR is needed
     if test x"${apr_found}" = xyes ; then \
         APR_INCLUDEDIR=`${apr_config} --includedir`
 	AC_SUBST([APR_INCLUDEDIR])
+	APR_CPPFLAGS=`${apr_config} --cppflags`
+	AC_SUBST([APR_CPPFLAGS])
     else
 	AC_MSG_ERROR([APR is needed to build mod_suphp for Apache 2.x but was not found])
     fi