diff options
Diffstat (limited to 'package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch')
| -rw-r--r-- | package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch b/package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch index 1ad6712b7b..e9a7315317 100644 --- a/package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch +++ b/package/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch @@ -8,6 +8,9 @@ useful when cross-compiling), instead of using the one from the host system. Signed-off-by: Samuel Martin <s.martin49@gmail.com> +[yann.morin.1998@free.fr: adapt from 2.1.6 to 2.2.0; fix quoting in + AC_PATH_PROG] +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> --- configure.ac | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) @@ -16,11 +19,11 @@ diff --git a/configure.ac b/configure.ac index 02fb8aa..5a2267b 100644 --- a/configure.ac +++ b/configure.ac -@@ -3943,16 +3943,17 @@ dnl +@@ -4020,16 +4020,17 @@ AC_ARG_ENABLE(libgcrypt, [ --disable-libgcrypt gcrypt support (default enabled)]) AS_IF([test "${enable_libgcrypt}" != "no"], [ -+ AC_PATH_PROG(GCRYPT_CONFIG,libgcrypt-config,libgcrypt-config) ++ AC_PATH_PROG([GCRYPT_CONFIG],[libgcrypt-config],[libgcrypt-config]) AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [ - libgcrypt-config --version >/dev/null || \ + ${GCRYPT_CONFIG} --version >/dev/null || \ @@ -32,12 +35,9 @@ index 02fb8aa..5a2267b 100644 + GCRYPT_CFLAGS="`${GCRYPT_CONFIG} --cflags`" + GCRYPT_LIBS="`${GCRYPT_CONFIG} --libs`" ], [ - AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.]) + AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or pass --disable-libgcrypt.]) - ], [`libgcrypt-config --libs`]) + ], [`${GCRYPT_CONFIG} --libs`]) ], [ - AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.]) + AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or pass --disable-libgcrypt.]) ], [#include <gcrypt.h>] --- -1.8.5.4 - |
