Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 6002 invoked from network); 25 Mar 2009 08:43:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 25 Mar 2009 08:43:54 -0000 Received: (qmail 42369 invoked by uid 500); 25 Mar 2009 08:43:54 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 42275 invoked by uid 500); 25 Mar 2009 08:43:53 -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 42118 invoked by uid 99); 25 Mar 2009 08:43:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Mar 2009 08:43:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Mar 2009 08:43:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7946723888D5; Wed, 25 Mar 2009 08:43:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r758177 - /httpd/httpd/trunk/configure.in Date: Wed, 25 Mar 2009 08:43:29 -0000 To: cvs@httpd.apache.org From: jorton@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090325084330.7946723888D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jorton Date: Wed Mar 25 08:43:28 2009 New Revision: 758177 URL: http://svn.apache.org/viewvc?rev=758177&view=rev Log: * configure.in: Allow configure to be built without find_apu.m4, at least temporarily to allow buildconf against apr trunk. Modified: httpd/httpd/trunk/configure.in Modified: httpd/httpd/trunk/configure.in URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=758177&r1=758176&r2=758177&view=diff ============================================================================== --- httpd/httpd/trunk/configure.in (original) +++ httpd/httpd/trunk/configure.in Wed Mar 25 08:43:28 2009 @@ -120,7 +120,12 @@ elif test "x$with_included_apr" = "xyes"; then apu_found=reconfig else - APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1, ${apr_major_version}) + dnl If httpd is buildconf'ed against an apr 2.x tree, then 1.x + dnl isn't supported. + ifdef([APR_FIND_APU], [ + APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", + 1, ${apr_major_version}) + ], [apu_found=no]) fi if test "$apu_found" = "no"; then