External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 03:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

m4/virt-gnutls: remove code for gnutls < 2.2.0

Browse Source 
Commit d8a8af3492 changed the minimal required version of gnutls
so it's safe to remove the code for older versions.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-10-21 23:17:08 +02:00
parent 680d2f49da
commit 0c62ccf927
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
m4/virt-gnutls.m4
View File

@ -20,18 +20,16 @@ dnl
AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[ AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[
LIBVIRT_CHECK_PKG([GNUTLS], [gnutls], [2.2.0]) LIBVIRT_CHECK_PKG([GNUTLS], [gnutls], [2.2.0])
dnl Triple probe: gnutls < 2.12 only used gcrypt, gnutls >= 3.0 uses dnl Double probe: gnutls >= 2.12 had a configure option for gcrypt and
dnl only nettle, and versions in between had a configure option. dnl gnutls >= 3.0 uses only nettle. Our goal is to avoid gcrypt if we
dnl Our goal is to avoid gcrypt if we can prove gnutls uses nettle, dnl can prove gnutls uses nettle, but it is a safe fallback to use gcrypt
dnl but it is a safe fallback to use gcrypt if we can't prove anything.A dnl if we can't prove anything.
GNUTLS_GCRYPT= GNUTLS_GCRYPT=
if $PKG_CONFIG --exists 'gnutls >= 3.0'; then if $PKG_CONFIG --exists 'gnutls >= 3.0'; then
GNUTLS_GCRYPT="no" GNUTLS_GCRYPT="no"
elif $PKG_CONFIG --exists 'gnutls >= 2.12'; then
GNUTLS_GCRYPT="probe"
else else
GNUTLS_GCRYPT="yes" GNUTLS_GCRYPT="probe"
fi fi
if test "$GNUTLS_GCRYPT" = "probe"; then if test "$GNUTLS_GCRYPT" = "probe"; then