From: Joe Orton <jorton@apache.org>
Date: Thu, 27 Oct 2005 10:40:59 +0000 (+0000)
Subject: * configure.in: Move apr/apr-util version checks later to fix in-tree
X-Git-Tag: 2.3.0~2824
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c40db6cdcdacb22c588aa42917408e8e5f33421d;p=thirdparty%2Fapache%2Fhttpd.git

* 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/trunk@328852 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/configure.in b/configure.in
index dcdafb5bbaa..06436d47558 100644
--- a/configure.in
+++ b/configure.in
@@ -87,11 +87,6 @@ APR_INCLUDEDIR=`$apr_config --includedir`
 APR_VERSION=`$apr_config --version`
 APR_CONFIG="$APR_BINDIR/apr-`echo ${APR_VERSION} | sed 's,\..*,,'`-config"
 
-if test "${apr_found}" = "yes"; then
-  # Require APR 1.2.x otherwise fail
-  APACHE_CHECK_APxVER([apr], 1, 2)
-fi
-
 echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
 
 APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1, 1)
@@ -117,9 +112,6 @@ if test "$apu_found" = "reconfig"; then
   dnl We must be the last to build and the first to be cleaned
   AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
   AP_CLEAN_SRCLIB_DIRS="apr-util $AP_CLEAN_SRCLIB_DIRS"
-else
-  # Require APR-util 1.2.x otherwise fail
-  APACHE_CHECK_APxVER([apu], 1, 2)
 fi
 
 APR_ADDTO(LDFLAGS, `$apu_config --ldflags`)
@@ -323,6 +315,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