Merge r1347998 from trunk:

* configure.in: Enforce 1.4.0 as minimum APR version requirement.

PR: 52748

Submitted by: jorton
Reviewed/backported by: jim

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

diff --git a/STATUS b/STATUS
index 0dfe3e6fa279678b279013e9dad59ef852bfc738..0be320066375bee071bbccc515d754ab7a5a8650 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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 ]

diff --git a/configure.in b/configure.in
index e2317a1a3bf9ab78069d70222a11b516543468fe..c571c282c3efbab4e525f0ae103d86c3dc9d2933 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -91,7 +91,16 @@ if test "x$with_included_apr" = "xyes"; then
     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