From commits-return-12420-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Wed Dec 14 23:02:33 2011 Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0578496BC for ; Wed, 14 Dec 2011 23:02:33 +0000 (UTC) Received: (qmail 46378 invoked by uid 500); 14 Dec 2011 23:02:32 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 46335 invoked by uid 500); 14 Dec 2011 23:02:32 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 46328 invoked by uid 99); 14 Dec 2011 23:02:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Dec 2011 23:02:32 +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; Wed, 14 Dec 2011 23:02:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D242423888CD for ; Wed, 14 Dec 2011 23:02:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1214531 - in /apr/apr-util/branches/1.4.x: ./ build/crypto.m4 configure.in Date: Wed, 14 Dec 2011 23:02:06 -0000 To: commits@apr.apache.org From: minfrin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111214230206.D242423888CD@eris.apache.org> Author: minfrin Date: Wed Dec 14 23:02:06 2011 New Revision: 1214531 URL: http://svn.apache.org/viewvc?rev=1214531&view=rev Log: Backport: apr_crypto: Crypto library detection runs twice (from main configure logic as well as from APU_CHECK_CRYPTO). Crypto enablement depends on enablement of a crypto library, but forgetting to enable a crypto library silently proceeds without failing. Submitted by: trawick Modified: apr/apr-util/branches/1.4.x/ (props changed) apr/apr-util/branches/1.4.x/build/crypto.m4 apr/apr-util/branches/1.4.x/configure.in Propchange: apr/apr-util/branches/1.4.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 14 23:02:06 2011 @@ -1,4 +1,4 @@ -/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,1127648-1127649,1187984,1207704,1210524,1211987 +/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,1127648-1127649,1187984,1207704,1210524,1211987,1214516 /apr/apr-util/branches/1.3.x:896410,979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137,1154885 /apr/apr-util/branches/1.5.x:1002504,1002584-1002585,1002620,1002622-1002623,1002628,1207683,1207690,1207707,1209594,1210530,1212347 /apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630 Modified: apr/apr-util/branches/1.4.x/build/crypto.m4 URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/build/crypto.m4?rev=1214531&r1=1214530&r2=1214531&view=diff ============================================================================== --- apr/apr-util/branches/1.4.x/build/crypto.m4 (original) +++ apr/apr-util/branches/1.4.x/build/crypto.m4 Wed Dec 14 23:02:06 2011 @@ -34,6 +34,9 @@ AC_DEFUN([APU_CHECK_CRYPTO], [ APU_CHECK_CRYPTO_OPENSSL APU_CHECK_CRYPTO_NSS dnl add checks for other varieties of ssl here + if test "$apu_have_crypto" == "0"; then + AC_ERROR(Crypto was requested but no crypto library was enabled) + fi fi ], [ apu_have_crypto=0 Modified: apr/apr-util/branches/1.4.x/configure.in URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/configure.in?rev=1214531&r1=1214530&r2=1214531&view=diff ============================================================================== --- apr/apr-util/branches/1.4.x/configure.in (original) +++ apr/apr-util/branches/1.4.x/configure.in Wed Dec 14 23:02:06 2011 @@ -151,8 +151,6 @@ dnl Determine what DBM backend type to u dnl Find Expat dnl Find an iconv library APU_CHECK_CRYPTO -APU_CHECK_CRYPTO_OPENSSL -APU_CHECK_CRYPTO_NSS APU_FIND_LDAP APU_CHECK_DBM APU_CHECK_DBD