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