Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 36acd3e888044dea2ac0b2946f15616f968388c9 / . / import-layers / meta-openembedded / meta-oe / recipes-extended / rsyslog / rsyslog / use-pkgconfig-to-check-libgcrypt.patch
blob: 46eddd604bd38c02fcf7e664df618767a20d4b5f [file] [log] [blame]
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]1From 5c3ba79177f7d1763db33c4358af2af60ff214b7 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>
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]12Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]13---
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]14 configure.ac | 15 +--------------
15 1 file changed, 1 insertion(+), 14 deletions(-)
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]16
17diff --git a/configure.ac b/configure.ac
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]18index 0f31869..d35db42 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]19--- a/configure.ac
20+++ b/configure.ac
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]21@@ -777,20 +777,7 @@ AC_ARG_ENABLE(libgcrypt,
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]22 [enable_libgcrypt=yes]
23 )
24 if test "x$enable_libgcrypt" = "xyes"; then
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]25- AC_PATH_PROG([LIBGCRYPT_CONFIG],[libgcrypt-config],[no])
26- if test "x${LIBGCRYPT_CONFIG}" = "xno"; then
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]27- AC_MSG_FAILURE([libgcrypt-config not found in PATH])
28- fi
29- AC_CHECK_LIB(
30- [gcrypt],
31- [gcry_cipher_open],
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]32- [LIBGCRYPT_CFLAGS="`${LIBGCRYPT_CONFIG} --cflags`"
33- LIBGCRYPT_LIBS="`${LIBGCRYPT_CONFIG} --libs`"
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]34- ],
35- [AC_MSG_FAILURE([libgcrypt is missing])],
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]36- [`${LIBGCRYPT_CONFIG} --libs --cflags`]
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]37- )
38- AC_DEFINE([ENABLE_LIBGCRYPT], [1], [Indicator that LIBGCRYPT is present])
39+ PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt)
40 fi
41 AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes)
42 AC_SUBST(LIBGCRYPT_CFLAGS)
43--
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]442.8.1
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]45