apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1861959 - in /apr/apr/trunk: CHANGES build/crypto.m4
Date Sun, 23 Jun 2019 23:38:02 GMT
Author: minfrin
Date: Sun Jun 23 23:38:02 2019
New Revision: 1861959

URL: http://svn.apache.org/viewvc?rev=1861959&view=rev
Log:
apr_crypto_openssl: Remove unused link to the ssl library.

Modified:
    apr/apr/trunk/CHANGES
    apr/apr/trunk/build/crypto.m4

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=1861959&r1=1861958&r2=1861959&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Sun Jun 23 23:38:02 2019
@@ -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).

Modified: apr/apr/trunk/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/crypto.m4?rev=1861959&r1=1861958&r2=1861959&view=diff
==============================================================================
--- apr/apr/trunk/build/crypto.m4 (original)
+++ apr/apr/trunk/build/crypto.m4 Sun Jun 23 23:38:02 2019
@@ -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])



Mime
View raw message