From: Andrea Bolognani <abologna@redhat.com>
Date: Fri, 8 Apr 2016 09:01:09 +0000 (+0200)
Subject: configure: Move check for <gnutls/crypto.h>
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6c209a90f94d0c4731e6ce1b339ac7744a62e24f;p=libvirt.git

configure: Move check for <gnutls/crypto.h>

Checking for the availability of this header, just like checking
for the availability of gnutls_rnd(), requires CFLAGS and LIBS to
be set appropriately.

Fixes the following compilation errors on FreeBSD:

  qemu/qemu_domain.c:640:16: error: implicit declaration of function
   'gnutls_rnd' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
      if ((ret = gnutls_rnd(GNUTLS_RND_RANDOM, key, nbytes)) < 0) {
                 ^
  qemu/qemu_domain.c:640:27: error: use of undeclared identifier
   'GNUTLS_RND_RANDOM'; did you mean 'GNUTLS_CRD_ANON'?
      if ((ret = gnutls_rnd(GNUTLS_RND_RANDOM, key, nbytes)) < 0) {
                            ^~~~~~~~~~~~~~~~~
                            GNUTLS_CRD_ANON
---

diff --git a/configure.ac b/configure.ac
index c8c2895518..1eb19eef53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1281,11 +1281,6 @@ if test "x$with_gnutls" != "xno"; then
         [set to 1 if it is known or assumed that GNUTLS uses gcrypt])
     fi
 
-    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
 
@@ -1294,6 +1289,11 @@ if test "x$with_gnutls" != "xno"; then
   CFLAGS="$old_CFLAGS $GNUTLS_CFLAGS"
   LIBS="$old_LIBS $GNUTLS_LIBS"
 
+  dnl gnutls 3.x moved some declarations to a new header
+  AC_CHECK_HEADERS([gnutls/crypto.h], [], [], [[
+    #include <gnutls/gnutls.h>
+  ]])
+
   AC_CHECK_FUNCS([gnutls_rnd])
 
   CFLAGS="$old_CFLAGS"