From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 11 Dec 2011 08:00:25 +0000 (-0500)
Subject: Crypto checks are cumulative; the test program needs
X-Git-Tag: v3.0.2~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6986a2e5dc0f0ff37c6b613b5fbae82a03e8e297;p=thirdparty%2Flibarchive.git

Crypto checks are cumulative; the test program needs
to link against all crypto libs that have been found so far.

Add in probes for FreeBSD libmd hash functions.

SVN-Revision: 3904
---

diff --git a/configure.ac b/configure.ac
index fbc66ab6f..322cd0b06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -534,7 +534,7 @@ AC_DEFUN([CRYPTO_CHECK], [
     saved_LIBS="$LIBS"
     saved_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS -I. -I$srcdir -I$srcdir/libarchive"
-    LIBS="$LIBS $4"
+    LIBS="$LIBS $mdLIBS $4"
     touch "check_crypto_md.h"
     AC_MSG_CHECKING([support for ARCHIVE_CRYPTO_$1_$2])
     AC_LINK_IFELSE([AC_LANG_SOURCE([
@@ -569,13 +569,17 @@ main(int argc, char **argv)
 ])
 
 CRYPTO_CHECK(MD5, LIBC, md5)
+CRYPTO_CHECK(MD5, LIBMD, md5, -lmd)
 CRYPTO_CHECK(MD5, LIBSYSTEM, md5)
 CRYPTO_CHECK(RMD160, LIBC, rmd160)
+CRYPTO_CHECK(RMD160, LIBMD, rmd160, -lmd)
 CRYPTO_CHECK(SHA1, LIBC, sha1)
+CRYPTO_CHECK(SHA1, LIBMD, sha1, -lmd)
 CRYPTO_CHECK(SHA1, LIBSYSTEM, sha1)
 CRYPTO_CHECK(SHA256, LIBC, sha256)
 CRYPTO_CHECK(SHA256, LIBC2, sha256)
 CRYPTO_CHECK(SHA256, LIBC3, sha256)
+CRYPTO_CHECK(SHA256, LIBMD, sha256, -lmd)
 CRYPTO_CHECK(SHA256, LIBSYSTEM, sha256)
 CRYPTO_CHECK(SHA384, LIBC, sha384)
 CRYPTO_CHECK(SHA384, LIBC2, sha384)
@@ -584,6 +588,7 @@ CRYPTO_CHECK(SHA384, LIBSYSTEM, sha384)
 CRYPTO_CHECK(SHA512, LIBC, sha512)
 CRYPTO_CHECK(SHA512, LIBC2, sha512)
 CRYPTO_CHECK(SHA512, LIBC3, sha512)
+CRYPTO_CHECK(SHA512, LIBMD, sha512, -lmd)
 CRYPTO_CHECK(SHA512, LIBSYSTEM, sha512)
 
 if test "x$with_nettle" != "xno"; then