From: Eric Blake <eblake@redhat.com>
Date: Wed, 29 May 2013 03:15:08 +0000 (-0600)
Subject: build: fix build with newer gnutls
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7d21d6b;p=libvirt.git

build: fix build with newer gnutls

Building with gnutls 3.2.0 (such as shipped with current cygwin) fails
with:

rpc/virnettlscontext.c: In function 'virNetTLSSessionGetKeySize':
rpc/virnettlscontext.c:1358:5: error: implicit declaration of function 'gnutls_cipher_get_key_size' [-Wimplicit-function-declaration]

Yeah, it's stupid that gnutls broke API by moving their declaration
into a new header without including that header from the old one,
but it's easy enough to work around, all without breaking on gnutls
1.4.1 (hello RHEL 5) that lacked the new header.

* configure.ac (gnutls): Check for <gnutls/crypto.h>.
* src/rpc/virnettlscontext.c (includes): Include additional header.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index 2055637d7f..a9ee0bb6cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1103,10 +1103,15 @@ if test "x$with_gnutls" != "xno"; then
     dnl it explicitly for the calls to gcry_control/check_version
     GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt"
 
-    dnl We're not using gcrypt deprecated features so define GCRYPT_NO_DEPRECATED
-    dnl to avoid deprecated warnings
+    dnl We're not using gcrypt deprecated features so define
+    dnl GCRYPT_NO_DEPRECATED to avoid deprecated warnings
     GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DGCRYPT_NO_DEPRECATED"
 
+    dnl gnutls 3.x moved some declarations to a new header
+    AC_CHECK_HEADERS([gnutls/crypto.h], [], [], [[
+      #include <gnutls/gnutls.h>
+    ]])
+
     with_gnutls=yes
   fi
 
diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index e29c4392b2..f2ac5510d4 100644
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -25,6 +25,9 @@
 #include <stdlib.h>
 
 #include <gnutls/gnutls.h>
+#if HAVE_GNULTLS_CRYPTO_H
+# include <gnutls/crypto.h>
+#endif
 #include <gnutls/x509.h>
 #include "gnutls_1_0_compat.h"