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 22:54:14 UTC
svn commit: r1751567 - /apr/apr/trunk/build/crypto.m4
Author: minfrin
Date: Tue Jul 5 22:54:14 2016
New Revision: 1751567
URL: http://svn.apache.org/viewvc?rev=1751567&view=rev
Log:
Remove unnecessary duplication of autoconf tests for openssl and commoncrypto.
Modified:
apr/apr/trunk/build/crypto.m4
Modified: apr/apr/trunk/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/crypto.m4?rev=1751567&r1=1751566&r2=1751567&view=diff
==============================================================================
--- apr/apr/trunk/build/crypto.m4 (original)
+++ apr/apr/trunk/build/crypto.m4 Tue Jul 5 22:54:14 2016
@@ -113,16 +113,6 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
APR_ADDTO(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, EVP_CIPHER_CTX_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(LDFLAGS, [-L$withval/lib])
- APR_ADDTO(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