diff options
| author | minfrin <minfrin@13f79535-47bb-0310-9956-ffa450edef68> | 2019-06-23 23:38:02 +0000 |
|---|---|---|
| committer | minfrin <minfrin@13f79535-47bb-0310-9956-ffa450edef68> | 2019-06-23 23:38:02 +0000 |
| commit | 23fe1b21d569f8831bcf708c47adca798beba6c2 (patch) | |
| tree | ea757b9e8d944467a778ca9dc9758130547f9e5b | |
| parent | c946743e4c77b787f98d9f6b677c2e34dfdbcb39 (diff) | |
| download | libapr-23fe1b21d569f8831bcf708c47adca798beba6c2.tar.gz | |
apr_crypto_openssl: Remove unused link to the ssl library.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1861959 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | build/crypto.m4 | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes for APR 2.0.0 + *) apr_crypto_openssl: Remove unused link to the ssl library. + [Graham Leggett] + *) apu_dso_init: Fix pool lifetime and introduce a reference count. apu_dso_init() can now be called more than once (from multiple modules) and from unrelated pools (usually seen in unit tests). diff --git a/build/crypto.m4 b/build/crypto.m4 index 83a1f04bc..08257ade7 100644 --- a/build/crypto.m4 +++ b/build/crypto.m4 @@ -96,7 +96,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [ [ if test "$withval" = "yes"; 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)) + AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_new, openssl_have_libs=1) if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0"; then apu_have_openssl=1 fi @@ -112,7 +112,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [ AC_MSG_NOTICE(checking for openssl in $withval) 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)) + AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_new, openssl_have_libs=1) if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0"; then apu_have_openssl=1 APR_ADDTO(LDFLAGS, [-L$withval/lib]) @@ -132,7 +132,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [ dnl Since we have already done the AC_CHECK_LIB tests, if we have it, dnl we know the library is there. if test "$apu_have_openssl" = "1"; then - APR_ADDTO(LDADD_crypto_openssl, [$openssl_LDFLAGS -lssl -lcrypto]) + APR_ADDTO(LDADD_crypto_openssl, [$openssl_LDFLAGS -lcrypto]) apu_have_crypto=1 AC_MSG_CHECKING([for const input buffers in OpenSSL]) |