[libvirt] [PATCH 8/8] Remove check for gnutls/crypto.h

Assume its presence for gnutls >= 3.2. Check introduced by <commit 7d21d6b>. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- m4/virt-gnutls.m4 | 13 ------------- src/rpc/virnettlscontext.c | 4 +--- src/util/vircrypto.c | 4 +--- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/m4/virt-gnutls.m4 b/m4/virt-gnutls.m4 index f25cfb60f7..426a1a0348 100644 --- a/m4/virt-gnutls.m4 +++ b/m4/virt-gnutls.m4 @@ -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],[ diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 2c46aebf31..97b74de89e 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -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" diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 2118fdba22..bbc2a01f22 100644 --- a/src/util/vircrypto.c +++ b/src/util/vircrypto.c @@ -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"); -- 2.16.1