diff options
Diffstat (limited to 'meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch')
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch index 0352587268..f5ae65fb58 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d0852006bf3d305e8984b85b41997d43d4476937 Mon Sep 17 00:00:00 2001 | 1 | From d2dd13d930c91e45417c7361908f0af75e0e6c00 Mon Sep 17 00:00:00 2001 |
2 | From: Roy Li <rongqing.li@windriver.com> | 2 | From: Roy Li <rongqing.li@windriver.com> |
3 | Date: Wed, 18 Jun 2014 13:46:52 +0800 | 3 | Date: Wed, 18 Jun 2014 13:46:52 +0800 |
4 | Subject: [PATCH] use pkgconfig to check libgcrypt | 4 | Subject: [PATCH] use pkgconfig to check libgcrypt |
@@ -10,16 +10,15 @@ libgcrypt does no longer provide libgcrypt-config, and provide | |||
10 | 10 | ||
11 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 11 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
12 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | 12 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
13 | |||
14 | --- | 13 | --- |
15 | configure.ac | 15 +-------------- | 14 | configure.ac | 15 +-------------- |
16 | 1 file changed, 1 insertion(+), 14 deletions(-) | 15 | 1 file changed, 1 insertion(+), 14 deletions(-) |
17 | 16 | ||
18 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
19 | index 62178c3..b56c9c7 100644 | 18 | index f8c0ac8..794bfb3 100644 |
20 | --- a/configure.ac | 19 | --- a/configure.ac |
21 | +++ b/configure.ac | 20 | +++ b/configure.ac |
22 | @@ -889,20 +889,7 @@ AC_ARG_ENABLE(libgcrypt, | 21 | @@ -1217,20 +1217,7 @@ AC_ARG_ENABLE(libgcrypt, |
23 | [enable_libgcrypt=yes] | 22 | [enable_libgcrypt=yes] |
24 | ) | 23 | ) |
25 | if test "x$enable_libgcrypt" = "xyes"; then | 24 | if test "x$enable_libgcrypt" = "xyes"; then |
@@ -40,4 +39,4 @@ index 62178c3..b56c9c7 100644 | |||
40 | + PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt) | 39 | + PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt) |
41 | fi | 40 | fi |
42 | AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes) | 41 | AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes) |
43 | AC_SUBST(LIBGCRYPT_CFLAGS) | 42 | AM_CONDITIONAL(ENABLE_RSCRYUTIL, test x$enable_libgcrypt = xyes || test x$enable_openssl_crypto_provider = xyes) |