Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 1a4b7ee28bf7413af6513fb45ad0d0736048f866 / . / meta-openembedded / meta-oe / recipes-extended / rsyslog / rsyslog / use-pkgconfig-to-check-libgcrypt.patch
blob: 03525872681549f4b5815cab5d9a5a871c85f47f [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]1From d0852006bf3d305e8984b85b41997d43d4476937 Mon Sep 17 00:00:00 2001
2From: Roy Li <rongqing.li@windriver.com>
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]3Date: Wed, 18 Jun 2014 13:46:52 +0800
4Subject: [PATCH] use pkgconfig to check libgcrypt
5
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]6Upstream-Status: Inappropriate [configuration]
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]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>
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]12Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]13
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]14---
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]15 configure.ac | 15 +--------------
16 1 file changed, 1 insertion(+), 14 deletions(-)
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]17
18diff --git a/configure.ac b/configure.ac
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]19index 62178c3..b56c9c7 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]20--- a/configure.ac
21+++ b/configure.ac
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]22@@ -889,20 +889,7 @@ AC_ARG_ENABLE(libgcrypt,
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]23 [enable_libgcrypt=yes]
24 )
25 if test "x$enable_libgcrypt" = "xyes"; then
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]26- AC_PATH_PROG([LIBGCRYPT_CONFIG],[libgcrypt-config],[no])
27- if test "x${LIBGCRYPT_CONFIG}" = "xno"; then
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]28- AC_MSG_FAILURE([libgcrypt-config not found in PATH])
29- fi
30- AC_CHECK_LIB(
31- [gcrypt],
32- [gcry_cipher_open],
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]33- [LIBGCRYPT_CFLAGS="`${LIBGCRYPT_CONFIG} --cflags`"
34- LIBGCRYPT_LIBS="`${LIBGCRYPT_CONFIG} --libs`"
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]35- ],
36- [AC_MSG_FAILURE([libgcrypt is missing])],
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]37- [`${LIBGCRYPT_CONFIG} --libs --cflags`]
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]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)