提交 fe8a0679 编写于 作者: J Ján Tomko

Remove check for gnutls/crypto.h

Assume its presence for gnutls >= 3.2.

Check introduced by <commit 7d21d6b6>.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
上级 504b4f26
......@@ -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],[
......
......@@ -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"
......
......@@ -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");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册