httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r328852 - /httpd/httpd/trunk/configure.in
Date Thu, 27 Oct 2005 10:41:07 GMT
Author: jorton
Date: Thu Oct 27 03:40:59 2005
New Revision: 328852

URL: http://svn.apache.org/viewcvs?rev=328852&view=rev
Log:
* 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.

Modified:
    httpd/httpd/trunk/configure.in

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/configure.in?rev=328852&r1=328851&r2=328852&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Thu Oct 27 03:40:59 2005
@@ -87,11 +87,6 @@
 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 @@
   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`)
@@ -322,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



Mime
View raw message