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 2019/11/06 22:50:09 UTC
svn commit: r1869486 - in /apr/apr/trunk: CHANGES build/crypto.m4
Author: minfrin
Date: Wed Nov 6 22:50:09 2019
New Revision: 1869486
URL: http://svn.apache.org/viewvc?rev=1869486&view=rev
Log:
apr_crypto_commoncrypto: Remove stray reference to -lcrypto that
prevented commoncrypto being enabled.
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=1869486&r1=1869485&r2=1869486&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Wed Nov 6 22:50:09 2019
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes for APR 2.0.0
+ *) apr_crypto_commoncrypto: Remove stray reference to -lcrypto that
+ prevented commoncrypto being enabled. [Graham Leggett]
+
*) Add --tag=CC to libtool invocations. PR 62640. [Michael Osipov]
*) apr_thread_exit() is now a void function. [Joe Orton]
Modified: apr/apr/trunk/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/crypto.m4?rev=1869486&r1=1869485&r2=1869486&view=diff
==============================================================================
--- apr/apr/trunk/build/crypto.m4 (original)
+++ apr/apr/trunk/build/crypto.m4 Wed Nov 6 22:50:09 2019
@@ -251,7 +251,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_COMMONCRYPTO]
[
if test "$withval" = "yes"; 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))
+ AC_CHECK_LIB(System, CCKeyDerivationPBKDF, AC_CHECK_LIB(System, CCCryptorCreate, [commoncrypto_have_libs=1]))
if test "$commoncrypto_have_headers" != "0" && test "$commoncrypto_have_libs" != "0"; then
apu_have_commoncrypto=1
fi
@@ -267,7 +267,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_COMMONCRYPTO]
AC_MSG_NOTICE(checking for commoncrypto in $withval)
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))
+ AC_CHECK_LIB(System, CCKeyDerivationPBKDF, AC_CHECK_LIB(System, CCCryptorCreate, [commoncrypto_have_libs=1]))
if test "$commoncrypto_have_headers" != "0" && test "$commoncrypto_have_libs" != "0"; then
apu_have_commoncrypto=1
APR_ADDTO(LDFLAGS, [-L$withval/lib])