| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | * The upstream tests for libgcrypt are awkward and not working. |
| 2 | - Requires libgcrypt-config, which seems broken? |
| 3 | * AM_PATH_LIBGCRYPT exists for a reason, why not use it? KISS. |
| 4 | * Upstream abandoned AM_PATH_LIBGCRYPT in the past...newer automake ok? |
| 5 | |
| 6 | Upstream status: Pending |
| 7 | |
| 8 | Index: vlc-2.2.1/configure.ac |
| 9 | =================================================================== |
| 10 | --- vlc-2.2.1.orig/configure.ac |
| 11 | +++ vlc-2.2.1/configure.ac |
| 12 | @@ -4017,25 +4017,19 @@ PKG_ENABLE_MODULES_VLC([LIBXML2], [xml], |
| 13 | dnl |
| 14 | dnl libgcrypt |
| 15 | dnl |
| 16 | +GCRYPT_LIBVER=1 |
| 17 | +GCRYPT_REQ=1.1.94 |
| 18 | AC_ARG_ENABLE(libgcrypt, |
| 19 | [ --disable-libgcrypt gcrypt support (default enabled)]) |
| 20 | AS_IF([test "${enable_libgcrypt}" != "no"], [ |
| 21 | - AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [ |
| 22 | - libgcrypt-config --version >/dev/null || \ |
| 23 | - AC_MSG_ERROR([gcrypt.h present but libgcrypt-config could not be found]) |
| 24 | - AC_CHECK_LIB(gcrypt, gcry_control, [ |
| 25 | - have_libgcrypt="yes" |
| 26 | - GCRYPT_CFLAGS="`libgcrypt-config --cflags`" |
| 27 | - GCRYPT_LIBS="`libgcrypt-config --libs`" |
| 28 | - ], [ |
| 29 | - AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or pass --disable-libgcrypt.]) |
| 30 | - ], [`libgcrypt-config --libs`]) |
| 31 | - ], [ |
| 32 | - AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or pass --disable-libgcrypt.]) |
| 33 | - ], [#include <gcrypt.h>] |
| 34 | - ) |
| 35 | + AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_REQ, |
| 36 | + [ |
| 37 | + GCRYPT_CFLAGS="$LIBGCRYPT_CFLAGS" |
| 38 | + GCRYPT_LIBS="$LIBGCRYPT_LIBS" |
| 39 | + ],[ |
| 40 | + AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.]) |
| 41 | + ]) |
| 42 | ]) |
| 43 | - |
| 44 | AC_SUBST(GCRYPT_CFLAGS) |
| 45 | AC_SUBST(GCRYPT_LIBS) |
| 46 | AM_CONDITIONAL([HAVE_GCRYPT], [test "${have_libgcrypt}" = "yes"]) |