You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/07/10 16:11:29 UTC
svn commit: r1359688 - in /httpd/httpd/branches/2.4.x: STATUS configure.in
Author: jim
Date: Tue Jul 10 14:11:29 2012
New Revision: 1359688
URL: http://svn.apache.org/viewvc?rev=1359688&view=rev
Log:
Merge r1347998 from trunk:
* configure.in: Enforce 1.4.0 as minimum APR version requirement.
PR: 52748
Submitted by: jorton
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/configure.in
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1359688&r1=1359687&r2=1359688&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Jul 10 14:11:29 2012
@@ -103,12 +103,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
53104. [Greg Ames]
+1: sf, covener, druggeri, jim
- * configure: Enforce 1.4.0 as minimum APR version requirement.
- PR: 52748
- trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1347998
- 2.4.x patch: trunk patch works
- +1: jorton, covener, jim
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/configure.in?rev=1359688&r1=1359687&r2=1359688&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/configure.in (original)
+++ httpd/httpd/branches/2.4.x/configure.in Tue Jul 10 14:11:29 2012
@@ -91,7 +91,16 @@ if test "x$with_included_apr" = "xyes";
AC_MSG_ERROR([Bundled APR requested but not found at ./srclib/. Download and unpack the corresponding apr and apr-util packages to ./srclib/.])
fi
else
- APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1 2)
+ APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1 2, [
+ version=`$apr_config --version`
+ case x${version} in
+ x1.[[0-3]].*)
+ AC_MSG_WARN([APR version 1.4.0 or later is required, found $version])
+ apr_acceptable=no
+ ;;
+ esac
+ unset version
+ ])
fi
if test "$apr_found" = "no"; then