You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mi...@apache.org on 2016/07/05 23:29:52 UTC
svn commit: r1751573 - in /apr/apr-util/branches/1.6.x: ./ build/crypto.m4
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 <openssl/evp.h>])
@@ -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