1*4882a593SmuzhiyunFrom 13da2bcde8e22dd0127a668374fdf79bed04d353 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Bart Van Assche <bvanassche@acm.org> 3*4882a593SmuzhiyunDate: Mon, 17 Sep 2018 07:33:34 -0700 4*4882a593SmuzhiyunSubject: [PATCH] configure: Fix -lcrypto -lz test 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunAvoid that the second crypto library test uses the cached result from 7*4882a593Smuzhiyunthe first test by explicitly clearing the cached test result. 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun[yann.morin.1998@free.fr: 10*4882a593Smuzhiyun - use an actual backport of 13da2bcde8e22dd0127a668374fdf79bed04d353 11*4882a593Smuzhiyun] 12*4882a593SmuzhiyunSigned-off-by: Yann E. MORIN <yann.morin.1998@free.fr> 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun configure | 1 + 15*4882a593Smuzhiyun configure.d/config_os_libs2 | 1 + 16*4882a593Smuzhiyun 2 files changed, 2 insertions(+) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/configure b/configure 19*4882a593Smuzhiyunindex 1116cecaad..33b8c93e57 100755 20*4882a593Smuzhiyun--- a/configure 21*4882a593Smuzhiyun+++ b/configure 22*4882a593Smuzhiyun@@ -23231,6 +23231,7 @@ if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : 23*4882a593Smuzhiyun CRYPTO="crypto"; LIBCRYPTO="-lcrypto" 24*4882a593Smuzhiyun else 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun+ unset ac_cv_lib_crypto_EVP_md5 27*4882a593Smuzhiyun { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_md5 in -lcrypto" >&5 28*4882a593Smuzhiyun $as_echo_n "checking for EVP_md5 in -lcrypto... " >&6; } 29*4882a593Smuzhiyun if ${ac_cv_lib_crypto_EVP_md5+:} false; then : 30*4882a593Smuzhiyundiff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 31*4882a593Smuzhiyunindex 75214cfff3..81788a2096 100644 32*4882a593Smuzhiyun--- a/configure.d/config_os_libs2 33*4882a593Smuzhiyun+++ b/configure.d/config_os_libs2 34*4882a593Smuzhiyun@@ -308,6 +308,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then 35*4882a593Smuzhiyun if test x$CRYPTO = x; then 36*4882a593Smuzhiyun AC_CHECK_LIB([crypto], [EVP_md5], 37*4882a593Smuzhiyun [CRYPTO="crypto"; LIBCRYPTO="-lcrypto"], [ 38*4882a593Smuzhiyun+ unset ac_cv_lib_crypto_EVP_md5 39*4882a593Smuzhiyun AC_CHECK_LIB([crypto], [EVP_md5], 40*4882a593Smuzhiyun [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [], 41*4882a593Smuzhiyun [-lz]) 42*4882a593Smuzhiyun-- 43*4882a593Smuzhiyun2.25.1 44*4882a593Smuzhiyun 45