From: Stefan Fritsch <sf@apache.org>
Date: Tue, 29 May 2012 18:50:17 +0000 (+0000)
Subject: Backport r1091330:
X-Git-Tag: 2.2.23~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b19e3e248944675054fc3f0e2a5dc5399967442;p=thirdparty%2Fapache%2Fhttpd.git

Backport r1091330:

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

Submitted by: jfclere
Reviewed by: rjung, rpluem, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1343914 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 4da3193addc..5160517e286 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ Changes with Apache 2.2.23
      envvars: Fix insecure handling of LD_LIBRARY_PATH that could lead to the
      current working directory to be searched for DSOs. [Stefan Fritsch]
 
+  *) configure: Fix usage with external apr and apu in non-default paths
+     and recent gcc versions >= 4.6. [Jean-Frederic Clere]
+
   *) core: Fix building against PCRE 8.30 by switching from the obsolete
      pcre_info() to pcre_fullinfo(). PR 52623 [Ruediger Pluem, Rainer Jung]
 
diff --git a/STATUS b/STATUS
index 9b725717a3b..7d305740a3a 100644
--- a/STATUS
+++ b/STATUS
@@ -93,18 +93,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * configure: Using external apr and apu in non-default path
-    breaks configure, since checking for apu version does not
-    set up apr include path in CPPFLAGS.
-    CPP with gcc before 4.6.2 only outputs an error, but our check
-    still succeeds; gcc 4.6.2 aborts and our check fails.
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs.cgi?rev=1091330&view=rev
-      Backport for 2.4.x: change was applied before branching 2.4.x.
-      Backport version for 2.2.x of patch:
-         http://people.apache.org/~rjung/patches/apu-version-check-backport-r1091330-2_2_x.patch
-      +1: rjung, rpluem, jorton
-      -1:
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/configure.in b/configure.in
index 0557b4addb2..d21c2847e09 100644
--- a/configure.in
+++ b/configure.in
@@ -361,7 +361,15 @@ fi
 
 if test "${apu_found}" = "yes"; then
   # Require APR-util 1.2.x otherwise fail
-  APACHE_CHECK_APxVER([apu], 1, 2)
+  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, 2)
+    CPPFLAGS="$apu_ckver_CPPFLAGS"
+  else
+    APACHE_CHECK_APxVER([apu], 1, 2)
+  fi
 fi
 
 dnl Check for what we can generate dependency files with