From d0852006bf3d305e8984b85b41997d43d4476937 Mon Sep 17 00:00:00 2001 From: Roy Li Date: Wed, 18 Jun 2014 13:46:52 +0800 Subject: [PATCH] use pkgconfig to check libgcrypt Upstream-Status: Inappropriate [configuration] libgcrypt does no longer provide libgcrypt-config, and provide *.pc, so we should use pkgconfig to check Signed-off-by: Roy Li Signed-off-by: Wenzong Fan --- configure.ac | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 62178c3..b56c9c7 100644 --- a/configure.ac +++ b/configure.ac @@ -889,20 +889,7 @@ AC_ARG_ENABLE(libgcrypt, [enable_libgcrypt=yes] ) if test "x$enable_libgcrypt" = "xyes"; then - AC_PATH_PROG([LIBGCRYPT_CONFIG],[libgcrypt-config],[no]) - if test "x${LIBGCRYPT_CONFIG}" = "xno"; then - AC_MSG_FAILURE([libgcrypt-config not found in PATH]) - fi - AC_CHECK_LIB( - [gcrypt], - [gcry_cipher_open], - [LIBGCRYPT_CFLAGS="`${LIBGCRYPT_CONFIG} --cflags`" - LIBGCRYPT_LIBS="`${LIBGCRYPT_CONFIG} --libs`" - ], - [AC_MSG_FAILURE([libgcrypt is missing])], - [`${LIBGCRYPT_CONFIG} --libs --cflags`] - ) - AC_DEFINE([ENABLE_LIBGCRYPT], [1], [Indicator that LIBGCRYPT is present]) + PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt) fi AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes) AC_SUBST(LIBGCRYPT_CFLAGS)