]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Allow apr and apr-util to be in 2 different location.
authorJean-Frederic Clere <jfclere@apache.org>
Tue, 12 Apr 2011 09:09:52 +0000 (09:09 +0000)
committerJean-Frederic Clere <jfclere@apache.org>
Tue, 12 Apr 2011 09:09:52 +0000 (09:09 +0000)
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

configure.in

index 6539f40cf794e2655aa2f57248ed2f8401610beb..8afe224cbe770545afef092e8eab705f7a00182b 100644 (file)
@@ -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