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 | 25 |
1 files changed, 11 insertions, 14 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 ebc10707cf..46eddd604b 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 @@ -9,34 +9,31 @@ libgcrypt does no longer provide libgcrypt-config, and provide *.pc, so we should use pkgconfig to check Signed-off-by: Roy Li <rongqing.li@windriver.com> +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> --- - configure.ac | 19 +------------------ - 1 file changed, 1 insertion(+), 18 deletions(-) + configure.ac | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac -index 017116e..1b880f8 100644 +index 0f31869..d35db42 100644 --- a/configure.ac +++ b/configure.ac -@@ -784,24 +784,7 @@ AC_ARG_ENABLE(libgcrypt, +@@ -777,20 +777,7 @@ AC_ARG_ENABLE(libgcrypt, [enable_libgcrypt=yes] ) if test "x$enable_libgcrypt" = "xyes"; then -- AC_CHECK_PROG( -- [HAVE_LIBGCRYPT_CONFIG], -- [libgcrypt-config], -- [yes],,, -- ) -- if test "x${HAVE_LIBGCRYPT_CONFIG}" != "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`" +- [LIBGCRYPT_CFLAGS="`${LIBGCRYPT_CONFIG} --cflags`" +- LIBGCRYPT_LIBS="`${LIBGCRYPT_CONFIG} --libs`" - ], - [AC_MSG_FAILURE([libgcrypt is missing])], -- [`libgcrypt-config --libs --cflags`] +- [`${LIBGCRYPT_CONFIG} --libs --cflags`] - ) - AC_DEFINE([ENABLE_LIBGCRYPT], [1], [Indicator that LIBGCRYPT is present]) + PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt) @@ -44,5 +41,5 @@ index 017116e..1b880f8 100644 AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes) AC_SUBST(LIBGCRYPT_CFLAGS) -- -1.7.9.5 +2.8.1 |