Merge r328641, r328852 from trunk:

* configure.in: Require apr >= 1.2.0 and apr-util >= 1.2.0.

* configure.in: Move apr/apr-util version checks later to fix in-tree
apr/apr-util build failures due to $EGREP not getting set early
enough.

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

diff --git a/CHANGES b/CHANGES
index a2aa04d4801772d3c724273bfaa7bd4328bb1994..6be983d3828a63a5a650b384f2929c768eb4a6ed 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.1.10
 
+  *) Require use of APR >= 1.2.0 and APR-util >= 1.2.0 when configured 
+     to use external copies of the libraries.  [Joe Orton] 
+
   *) Fix DESTDIR=... installation when using bundled copy of APR.
      [Torsten Foertsch <torsten.foertsch gmx.net>]
 

diff --git a/configure.in b/configure.in
index 6b7b056d93270b5c9c1694d00a7d770a0494c8ab..a48136c9c7f842c1d82eca324fac394a671ff290 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -314,6 +314,18 @@ AC_AIX
 AC_ISC_POSIX
 AC_MINIX
 
+# Ensure that satisfactory versions of apr and apr-util are 
+# found if external copies are configured.
+if test "${apr_found}" = "yes"; then
+  # Require APR 1.2.x otherwise fail
+  APACHE_CHECK_APxVER([apr], 1, 2)
+fi
+
+if test "${apu_found}" = "yes"; then
+  # Require APR-util 1.2.x otherwise fail
+  APACHE_CHECK_APxVER([apu], 1, 2)
+fi
+
 dnl Check for what we can generate dependency files with
 APR_CHECK_DEPEND