Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 94562 invoked from network); 27 Oct 2005 10:41:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 27 Oct 2005 10:41:32 -0000 Received: (qmail 35494 invoked by uid 500); 27 Oct 2005 10:41:30 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 35287 invoked by uid 500); 27 Oct 2005 10:41:29 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 35275 invoked by uid 99); 27 Oct 2005 10:41:29 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 27 Oct 2005 03:41:28 -0700 Received: (qmail 94002 invoked by uid 65534); 27 Oct 2005 10:41:08 -0000 Message-ID: <20051027104108.93977.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r328852 - /httpd/httpd/trunk/configure.in Date: Thu, 27 Oct 2005 10:41:07 -0000 To: cvs@httpd.apache.org From: jorton@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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