You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by yl...@apache.org on 2021/09/18 13:38:26 UTC
svn commit: r1893418 - in /apr/apr-util/branches/1.6.x: ./ CHANGES
build/crypto.m4
Author: ylavic
Date: Sat Sep 18 13:38:26 2021
New Revision: 1893418
URL: http://svn.apache.org/viewvc?rev=1893418&view=rev
Log:
Merge r1869486 from trunk:
apr_crypto_commoncrypto: Remove stray reference to -lcrypto that
prevented commoncrypto being enabled.
Submitted by: minfrin
Reviewed by: ylavic
Modified:
apr/apr-util/branches/1.6.x/ (props changed)
apr/apr-util/branches/1.6.x/CHANGES
apr/apr-util/branches/1.6.x/build/crypto.m4
Propchange: apr/apr-util/branches/1.6.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1869486
Modified: apr/apr-util/branches/1.6.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/CHANGES?rev=1893418&r1=1893417&r2=1893418&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.6.x/CHANGES [utf-8] Sat Sep 18 13:38:26 2021
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with APR-util 1.6.2
+ *) 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_dbm_gdbm: Fix handling of error codes. This makes gdbm 1.14 work.
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=1893418&r1=1893417&r2=1893418&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/build/crypto.m4 (original)
+++ apr/apr-util/branches/1.6.x/build/crypto.m4 Sat Sep 18 13:38:26 2021
@@ -245,7 +245,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
@@ -261,7 +261,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])