External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove check for gnutls/crypto.h

Browse Source 
Assume its presence for gnutls >= 3.2.

Check introduced by <commit 7d21d6b>.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Ján Tomko 2018-05-15 12:48:33 +02:00
parent 504b4f2669
commit fe8a06798d
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
m4/virt-gnutls.m4
View File

@ -27,19 +27,6 @@ AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[
dnl Require gnutls >= 3.2.0 because of 3.2.11 in Ubuntu 14.04
dnl That should have all the functions we use (in >= 2.12)
dnl and also use nettle, because it's >= 3.0
if test "$with_gnutls" = "yes" ; then
OLD_CFLAGS="$CFLAGS"
OLD_LIBS="$LIBS"
CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
LIBS="$LIBS $GNUTLS_LIBS"
AC_CHECK_HEADERS([gnutls/crypto.h], [], [], [[
#include <gnutls/gnutls.h>
]])
CFLAGS="$OLD_CFLAGS"
LIBS="$OLD_LIBS"
fi
])
AC_DEFUN([LIBVIRT_RESULT_GNUTLS],[

4
src/rpc/virnettlscontext.c
View File

@ -25,9 +25,7 @@
#include <stdlib.h>
#include <gnutls/gnutls.h>
#if HAVE_GNUTLS_CRYPTO_H
# include <gnutls/crypto.h>
#endif
#include <gnutls/crypto.h>
#include <gnutls/x509.h>
#include "virnettlscontext.h"

4
src/util/vircrypto.c
View File

@ -28,9 +28,7 @@
#ifdef WITH_GNUTLS
# include <gnutls/gnutls.h>
# if HAVE_GNUTLS_CRYPTO_H
# include <gnutls/crypto.h>
# endif
# include <gnutls/crypto.h>
#endif
VIR_LOG_INIT("util.crypto");