1From d0852006bf3d305e8984b85b41997d43d4476937 Mon Sep 17 00:00:00 2001
2From: Roy Li <rongqing.li@windriver.com>
3Date: Wed, 18 Jun 2014 13:46:52 +0800
4Subject: [PATCH] use pkgconfig to check libgcrypt
5
6Upstream-Status: Inappropriate [configuration]
7
8libgcrypt does no longer provide libgcrypt-config, and provide
9*.pc, so we should use pkgconfig to check
10
11Signed-off-by: Roy Li <rongqing.li@windriver.com>
12Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
13
14---
15 configure.ac | 15 +--------------
16 1 file changed, 1 insertion(+), 14 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index 62178c3..b56c9c7 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -889,20 +889,7 @@ AC_ARG_ENABLE(libgcrypt,
23         [enable_libgcrypt=yes]
24 )
25 if test "x$enable_libgcrypt" = "xyes"; then
26-	AC_PATH_PROG([LIBGCRYPT_CONFIG],[libgcrypt-config],[no])
27-        if test "x${LIBGCRYPT_CONFIG}" = "xno"; then
28-           AC_MSG_FAILURE([libgcrypt-config not found in PATH])
29-        fi
30-        AC_CHECK_LIB(
31-		[gcrypt],
32-        	[gcry_cipher_open],
33-        	[LIBGCRYPT_CFLAGS="`${LIBGCRYPT_CONFIG} --cflags`"
34-        	LIBGCRYPT_LIBS="`${LIBGCRYPT_CONFIG} --libs`"
35-        	],
36-        	[AC_MSG_FAILURE([libgcrypt is missing])],
37-        	[`${LIBGCRYPT_CONFIG} --libs --cflags`]
38-        	)
39-	AC_DEFINE([ENABLE_LIBGCRYPT], [1], [Indicator that LIBGCRYPT is present])
40+	PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt)
41 fi
42 AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes)
43 AC_SUBST(LIBGCRYPT_CFLAGS)
44