Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 94AB99523 for ; Tue, 21 Feb 2012 18:10:54 +0000 (UTC) Received: (qmail 21878 invoked by uid 500); 21 Feb 2012 18:10:54 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 21851 invoked by uid 500); 21 Feb 2012 18:10:54 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 21844 invoked by uid 99); 21 Feb 2012 18:10:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Feb 2012 18:10:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 21 Feb 2012 18:10:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 463A12388B46 for ; Tue, 21 Feb 2012 18:10:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1291949 - /subversion/trunk/build/ac-macros/apache.m4 Date: Tue, 21 Feb 2012 18:10:31 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120221181031.463A12388B46@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: philip Date: Tue Feb 21 18:10:30 2012 New Revision: 1291949 URL: http://svn.apache.org/viewvc?rev=1291949&view=rev Log: * build/ac-macros/apache.m4: Allow httpd 2.5 with APR 2. Not sure I fully understand this check, but this allows Subversion trunk to build with httpd and APR trunk. Modified: subversion/trunk/build/ac-macros/apache.m4 Modified: subversion/trunk/build/ac-macros/apache.m4 URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/apache.m4?rev=1291949&r1=1291948&r2=1291949&view=diff ============================================================================== --- subversion/trunk/build/ac-macros/apache.m4 (original) +++ subversion/trunk/build/ac-macros/apache.m4 Tue Feb 21 18:10:30 2012 @@ -100,7 +100,7 @@ if test -n "$APXS" && test "$APXS" != "n apache_minor_version_wanted_regex=["[1-4]"] ;; 2) - apache_minor_version_wanted_regex=["[3-4]"] + apache_minor_version_wanted_regex=["[3-5]"] ;; *) AC_MSG_ERROR([unknown APR version])