From: Jean-Frederic Clere <jfclere@apache.org>
Date: Tue, 12 Apr 2011 09:09:52 +0000 (+0000)
Subject: Allow apr and apr-util to be in 2 different location.
X-Git-Tag: 2.3.12~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b69191e95b9fb94acf8adac5b67cbd3c02e64aa3;p=thirdparty%2Fapache%2Fhttpd.git

Allow apr and apr-util to be in 2 different location.
Otherwise: apr_version.h is not found when apr-util is tested.


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

diff --git a/configure.in b/configure.in
index 6539f40cf79..8afe224cbe7 100644
--- a/configure.in
+++ b/configure.in
@@ -367,7 +367,15 @@ fi
 
 if test "${apu_found}" = "yes"; then
   # Require at least APR-util 1.3.x otherwise fail
-  APACHE_CHECK_APxVER([apu], 1, 3)
+  if test "${apr_found}" = "yes"; then
+    # we need to add the APR includes to CPPFLAGS
+    apu_ckver_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS `$apr_config --includes`"
+    APACHE_CHECK_APxVER([apu], 1, 3)
+    CPPFLAGS="$apu_ckver_CPPFLAGS"
+  else
+    APACHE_CHECK_APxVER([apu], 1, 3)
+  fi
 fi
 
 dnl Check for what we can generate dependency files with