Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 03455200B4A for ; Wed, 6 Jul 2016 01:29:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 01E80160A6F; Tue, 5 Jul 2016 23:29:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4A367160A60 for ; Wed, 6 Jul 2016 01:29:56 +0200 (CEST) Received: (qmail 65183 invoked by uid 500); 5 Jul 2016 23:29:55 -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 65174 invoked by uid 99); 5 Jul 2016 23:29:55 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jul 2016 23:29:55 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 16CEFCA088 for ; Tue, 5 Jul 2016 23:29:55 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.513 X-Spam-Level: X-Spam-Status: No, score=0.513 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.287] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id UTbrr908PkJf for ; Tue, 5 Jul 2016 23:29:54 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 36F355FCD8 for ; Tue, 5 Jul 2016 23:29:54 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 52646E0360 for ; Tue, 5 Jul 2016 23:29:53 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id B84063A023B for ; Tue, 5 Jul 2016 23:29:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1751573 - in /apr/apr-util/branches/1.6.x: ./ build/crypto.m4 Date: Tue, 05 Jul 2016 23:29:52 -0000 To: commits@apr.apache.org From: minfrin@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160705232952.B84063A023B@svn01-us-west.apache.org> archived-at: Tue, 05 Jul 2016 23:29:57 -0000 Author: minfrin Date: Tue Jul 5 23:29:52 2016 New Revision: 1751573 URL: http://svn.apache.org/viewvc?rev=1751573&view=rev Log: Backport r1751567 Remove unnecessary duplication of autoconf tests for openssl and commoncrypto. Modified: apr/apr-util/branches/1.6.x/ (props changed) apr/apr-util/branches/1.6.x/build/crypto.m4 Propchange: apr/apr-util/branches/1.6.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jul 5 23:29:52 2016 @@ -1,4 +1,4 @@ -/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,982408-982409,998533,1086937,1127053,1127648,1128838,1129433,1133587,1207704,1210524,1211987,1214516,1308087,1308131,1308318,1327636,1340286,1346865,1357761,1357772,1357780,1357966,1357968,1357979,1358295,1358480,1361811,1362241,1362248,1362252,1362255,1363076,1369681,1370626,1371811,1371817,1371919,1371923,1382174,1389154,1389169,1390461,1390477,1402870,1402897,1402903,1402907,1406088,1422413,1425356,1426442,1426448,1438960,1449308,1449314,1460185,1460243-1460244,1462219,1462224,1484271,1493715,1495887,1495889,1496407,1516261,1523479,1529554,1531009,1541054,1543399,1544846,1618843,1619438,1625247,1626561,1648830,1711657,1722547,1728958,1728963,1747941 +/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,982408-982409,998533,1086937,1127053,1127648,1128838,1129433,1133587,1207704,1210524,1211987,1214516,1308087,1308131,1308318,1327636,1340286,1346865,1357761,1357772,1357780,1357966,1357968,1357979,1358295,1358480,1361811,1362241,1362248,1362252,1362255,1363076,1369681,1370626,1371811,1371817,1371919,1371923,1382174,1389154,1389169,1390461,1390477,1402870,1402897,1402903,1402907,1406088,1422413,1425356,1426442,1426448,1438960,1449308,1449314,1460185,1460243-1460244,1462219,1462224,1484271,1493715,1495887,1495889,1496407,1516261,1523479,1529554,1531009,1541054,1543399,1544846,1618843,1619438,1625247,1626561,1648830,1711657,1722547,1728958,1728963,1747941,1751567 /apr/apr-util/branches/1.3.x:896410,1154885 /apr/apr-util/branches/1.4.x:1126217,1211211,1211219,1211223,1211330 /apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630,1626561 Modified: apr/apr-util/branches/1.6.x/build/crypto.m4 URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/build/crypto.m4?rev=1751573&r1=1751572&r2=1751573&view=diff ============================================================================== --- apr/apr-util/branches/1.6.x/build/crypto.m4 (original) +++ apr/apr-util/branches/1.6.x/build/crypto.m4 Tue Jul 5 23:29:52 2016 @@ -113,16 +113,6 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [ APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include]) fi - if test "$apu_have_openssl" != "1"; then - AC_CHECK_HEADERS(openssl/x509.h, [openssl_have_headers=1]) - AC_CHECK_LIB(crypto, BN_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto)) - if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0"; then - apu_have_openssl=1 - APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) - APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include]) - fi - fi - AC_CHECK_DECLS([EVP_PKEY_CTX_new], [], [], [#include ]) @@ -278,16 +268,6 @@ AC_DEFUN([APU_CHECK_CRYPTO_COMMONCRYPTO] APR_ADDTO(INCLUDES, [-I$withval/include]) fi - if test "$apu_have_commoncrypto" != "1"; then - AC_CHECK_HEADERS(CommonCrypto/CommonKeyDerivation.h, [commoncrypto_have_headers=1]) - AC_CHECK_LIB(System, CCKeyDerivationPBKDF, AC_CHECK_LIB(System, CCCryptorCreate, [commoncrypto_have_libs=1],,-lcrypto)) - if test "$commoncrypto_have_headers" != "0" && test "$commoncrypto_have_libs" != "0"; then - apu_have_commoncrypto=1 - APR_ADDTO(LDFLAGS, [-L$withval/lib]) - APR_ADDTO(INCLUDES, [-I$withval/include]) - fi - fi - fi ], [ apu_have_commoncrypto=0