From 3c98f73266361b3194da957f47c20c116b0a4ad1 Mon Sep 17 00:00:00 2001 From: Tadeusz Struk Date: Tue, 28 Jan 2020 14:39:06 -0800 Subject: [PATCH] build: don't link everything against libgcrypt Use AM_PATH_LIBGCRYPT instead of AC_CHECK_LIB for checking libgcrypt, with doesn't add -lgcrypt to the globac $LIBS. Fixes: #1365 Signed-off-by: Tadeusz Struk --- configure.ac | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index cc85edc39..777dd7426 100644 --- a/configure.ac +++ b/configure.ac @@ -138,13 +138,9 @@ AM_CONDITIONAL(ESYS_GCRYPT, test "x$with_crypto" = "xgcrypt") AS_IF([test "x$enable_esapi" = xyes], [AS_IF([test "x$with_crypto" = xgcrypt], [ - AC_CHECK_HEADER([gcrypt.h],, - [AC_MSG_ERROR([Missing required header: gcrypt.h.])]) - AC_CHECK_LIB([gcrypt], - [gcry_mac_open],, - [AC_MSG_ERROR([Missing required library: gcrypt.])]) - TSS2_ESYS_CFLAGS_CRYPTO="" - TSS2_ESYS_LDFLAGS_CRYPTO="-lgcrypt" + AM_PATH_LIBGCRYPT([1.6.0], [], [AC_MSG_ERROR([Missing required gcrypt library])]) + TSS2_ESYS_CFLAGS_CRYPTO="$LIBGCRYPT_CFLAGS" + TSS2_ESYS_LDFLAGS_CRYPTO="$LIBGCRYPT_LIBS" ], [test "x$with_crypto" = xossl], [ PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto]) AC_DEFINE([OSSL], [1], [OpenSSL cryptographic backend])