From bcfcc8509a65cef26d60fdd3a7bf8e3def9057f1 Mon Sep 17 00:00:00 2001
From: Paul Querna <pquerna@apache.org>
Date: Thu, 12 Jul 2007 02:06:01 +0000
Subject: [PATCH] Fix VPATH builds of httpd with the apr_memcache backend for
 ssl sessions, when APR and APR-Util are also in a VPATH.  This is caused by
 APR_INCLUDEDIR actually having multiple paths in a VPATH builds, so we need
 to use _INCLUDES instead.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@555458 13f79535-47bb-0310-9956-ffa450edef68
---
 configure.in          | 2 ++
 modules/ssl/config.m4 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index dd560e1ecf..7f267f2000 100644
--- a/configure.in
+++ b/configure.in
@@ -95,6 +95,7 @@ APR_ADDTO(LDFLAGS, `$apr_config --ldflags`)
 SHLIBPATH_VAR=`$apr_config --shlib-path-var`
 APR_BINDIR=`$apr_config --bindir`
 APR_INCLUDEDIR=`$apr_config --includedir`
+APR_INCLUDES=`$apr_config --includes`
 APR_VERSION=`$apr_config --version`
 APR_CONFIG="$APR_BINDIR/apr-`echo ${APR_VERSION} | sed 's,\..*,,'`-config"
 
@@ -136,6 +137,7 @@ fi
 APR_ADDTO(LDFLAGS, `$apu_config --ldflags`)
 APU_BINDIR=`$apu_config --bindir`
 APU_INCLUDEDIR=`$apu_config --includedir`
+APU_INCLUDES=`$apu_config --includes`
 APU_VERSION=`$apu_config --version`
 APU_CONFIG="$APU_BINDIR/apu-`echo ${APU_VERSION} | sed 's,\..*,,'`-config"
 
diff --git a/modules/ssl/config.m4 b/modules/ssl/config.m4
index 68cf6f743f..ef9cdf2c1a 100644
--- a/modules/ssl/config.m4
+++ b/modules/ssl/config.m4
@@ -117,7 +117,7 @@ AC_DEFUN([CHECK_SSL_MEMCACHE], [
   fi
   if test "$ap_ssltk_mc" = "yes"; then
     save_cpp=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS -I$APR_INCLUDEDIR -I$APU_INCLUDEDIR"
+    CPPFLAGS="$CPPFLAGS -I$APR_INCLUDES -I$APU_INCLUDES"
     AC_CHECK_HEADER(
       [apr_memcache.h],
       [],
-- 
2.50.1