You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2012/05/29 20:50:18 UTC
svn commit: r1343914 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
configure.in
Author: sf
Date: Tue May 29 18:50:17 2012
New Revision: 1343914
URL: http://svn.apache.org/viewvc?rev=1343914&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/configure.in
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1343914&r1=1343913&r2=1343914&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue May 29 18:50:17 2012
@@ -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]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1343914&r1=1343913&r2=1343914&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue May 29 18:50:17 2012
@@ -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 ]
Modified: httpd/httpd/branches/2.2.x/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/configure.in?rev=1343914&r1=1343913&r2=1343914&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/configure.in (original)
+++ httpd/httpd/branches/2.2.x/configure.in Tue May 29 18:50:17 2012
@@ -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