vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Aug 23 23:29:09 2014 +0300| [3fd4c0e755194fdf127d1af8c1f41219afc3b691] | committer: Rémi Denis-Courmont
gnutls: require version 3.1.11 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3fd4c0e755194fdf127d1af8c1f41219afc3b691 --- configure.ac | 2 +- contrib/src/gnutls/rules.mak | 2 +- modules/misc/gnutls.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c10fded..a71055e 100644 --- a/configure.ac +++ b/configure.ac @@ -4064,7 +4064,7 @@ dnl AC_ARG_ENABLE(gnutls, [ --enable-gnutls GNU TLS TLS/SSL support (default enabled)]) AS_IF([test "${enable_gnutls}" != "no"], [ - PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.1.9], [ + PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.1.11], [ VLC_ADD_PLUGIN([gnutls]) ], [ AS_IF([test -n "${enable_gnutls}"], [ diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak index a05fb07..27497dd 100644 --- a/contrib/src/gnutls/rules.mak +++ b/contrib/src/gnutls/rules.mak @@ -8,7 +8,7 @@ ifndef HAVE_DARWIN_OS PKGS += gnutls endif endif -ifeq ($(call need_pkg,"gnutls >= 3.1.9"),) +ifeq ($(call need_pkg,"gnutls >= 3.1.11"),) PKGS_FOUND += gnutls endif diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c index e9e999f..280fa5b 100644 --- a/modules/misc/gnutls.c +++ b/modules/misc/gnutls.c @@ -61,7 +61,7 @@ static vlc_mutex_t gnutls_mutex = VLC_STATIC_MUTEX; */ static int gnutls_Init (vlc_object_t *obj) { - const char *version = gnutls_check_version ("3.1.9"); + const char *version = gnutls_check_version ("3.1.11"); if (version == NULL) { msg_Err (obj, "unsupported GnuTLS version"); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
