From: Joerg Sonnenberger <joerg@bec.de>
Date: Tue, 4 Sep 2018 13:50:17 +0000 (+0200)
Subject: Don't disable -lcrypto if all hashes are provided by libc
X-Git-Tag: v3.4.0~175^2~6^2^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90d0fc57315d202e06b806ea2a4ae57e4f010edc;p=thirdparty%2Flibarchive.git

Don't disable -lcrypto if all hashes are provided by libc

Since libarchive contains AES support nowadays, libcrypto will be needed
even if all hashes are provided otherwise.
---

diff --git a/configure.ac b/configure.ac
index 0820717f1..17d664188 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1153,12 +1153,7 @@ if test "x$with_openssl" != "xno"; then
     CRYPTO_CHECK(SHA256, OPENSSL, sha256)
     CRYPTO_CHECK(SHA384, OPENSSL, sha384)
     CRYPTO_CHECK(SHA512, OPENSSL, sha512)
-    if test "x$found_OPENSSL" != "xyes"; then
-      LIBS=$saved_LIBS
-    else
-      AC_CHECK_FUNCS([PKCS5_PBKDF2_HMAC_SHA1])
-    fi
-    AC_CHECK_LIB(crypto,EVP_CIPHER_CTX_init)
+    AC_CHECK_FUNCS([PKCS5_PBKDF2_HMAC_SHA1])
 fi
 
 # Probe libmd AFTER OpenSSL/libcrypto.