package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch

   1 From 88bf3313850bc7f0e6db21daee2b8d8e607b7bb4 Mon Sep 17 00:00:00 2001
   2 From: Samuel Martin <s.martin49@gmail.com>
   3 Date: Sat, 8 Feb 2014 14:33:27 +0100
   4 Subject: [PATCH] configure.ac: add check for libgcrypt-config program
   5
   6 This allows to override the default libgcrypt-config location (which is
   7 useful when cross-compiling), instead of using the one from the host
   8 system.
   9
  10 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
  11 [yann.morin.1998@free.fr: adapt from 2.1.6 to 2.2.0; fix quoting in
  12  AC_PATH_PROG]
  13 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
  14 ---
  15  configure.ac | 9 +++++----
  16  1 file changed, 5 insertions(+), 4 deletions(-)
  17
  18 diff --git a/configure.ac b/configure.ac
  19 index 02fb8aa..5a2267b 100644
  20 --- a/configure.ac
  21 +++ b/configure.ac
  22 @@ -4020,16 +4020,17 @@
  23  AC_ARG_ENABLE(libgcrypt,
  24    [  --disable-libgcrypt     gcrypt support (default enabled)])
  25  AS_IF([test "${enable_libgcrypt}" != "no"], [
  26 +  AC_PATH_PROG([GCRYPT_CONFIG],[libgcrypt-config],[libgcrypt-config])
  27    AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [
  28 -    libgcrypt-config --version >/dev/null || \
  29 +    ${GCRYPT_CONFIG} --version >/dev/null || \
  30          AC_MSG_ERROR([gcrypt.h present but libgcrypt-config could not be found])
  31      AC_CHECK_LIB(gcrypt, gcry_control, [
  32        have_libgcrypt="yes"
  33 -      GCRYPT_CFLAGS="`libgcrypt-config --cflags`"
  34 -      GCRYPT_LIBS="`libgcrypt-config --libs`"
  35 +      GCRYPT_CFLAGS="`${GCRYPT_CONFIG} --cflags`"
  36 +      GCRYPT_LIBS="`${GCRYPT_CONFIG} --libs`"
  37      ], [
  38        AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or pass --disable-libgcrypt.])
  39 -    ], [`libgcrypt-config --libs`])
  40 +    ], [`${GCRYPT_CONFIG} --libs`])
  41    ], [
  42      AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or pass --disable-libgcrypt.])
  43    ], [#include <gcrypt.h>]