Use $INCLUDES rather than adding yet another place to edit include dirs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97669 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index 8579d33b4dd8e427ab9ed2824182abd67473bd6c..1d6d4632efc40250bea8921a2fe804628bd66fc6 100644 (file)
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -36,7 +36,7 @@ dnl these are the front-end authentication modules
 APACHE_MODULE(auth_basic, basic authentication, , , yes)
 APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most, [
   ap_old_cppflags=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS -I$APR_SOURCE_DIR/include -I$abs_builddir/srclib/apr/include"
+  CPPFLAGS="$CPPFLAGS $INCLUDES"
   AC_TRY_COMPILE([#include <apr.h>], [
 #if !APR_HAS_RANDOM 
 #error You need APR random support to use mod_auth_digest. 

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 80b4ea37ce71c6ca10878f6ef1943524d89b2a89..726dfe296350af6f47f2f31e294a4f2ff65fe459 100644 (file)
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -42,7 +42,7 @@ APACHE_MODULE(deflate, Deflate transfer encoding support, , , no, [
     if test "$ap_zlib_base" != "/usr"; then
       APR_ADDTO(INCLUDES, [-I${ap_zlib_base}/include])
       dnl put in CPPFLAGS temporarily so that AC_TRY_LINK below will work
-      CPPFLAGS="$CPPFLAGS -I${ap_zlib_base}/include"
+      CPPFLAGS="$CPPFLAGS $INCLUDES"
       APR_ADDTO(LDFLAGS, [-L${ap_zlib_base}/lib])
       if test "x$ap_platform_runtime_link_flag" != "x"; then
          APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag${ap_zlib_base}/lib])

diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
index 60b9138ffc988703f66a4870140bc3f92397b523..5b8a6587a3f7233016fef57dd64bf7bdf7d84704 100644 (file)
--- a/modules/mappers/config9.m4
+++ b/modules/mappers/config9.m4
@@ -23,7 +23,7 @@ elif test "$enable_so" = "shared"; then
 fi
 
 ap_old_cppflags=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS -I$APR_SOURCE_DIR/include -I$abs_builddir/srclib/apr/include"
+CPPFLAGS="$CPPFLAGS $INCLUDES"
 AC_TRY_COMPILE([#include <apr.h>], [
 #if !APR_HAS_DSO
 #error You need APR DSO support to use mod_so.