From: Eric Blake <eblake@redhat.com>
Date: Tue, 26 Feb 2013 23:43:03 +0000 (-0700)
Subject: build: don't use gcrypt.h without gnutls support
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=76f352690a7f9909f328e8873e06fb625ca4baa6;p=libvirt.git

build: don't use gcrypt.h without gnutls support

Eugene Marcotte reported that if gcrypt-devel (a prereq of
gnutls-devel) is not present, then compilation fails due to
an unconditional use of <gcrypt.h>.

* src/libvirt.c (includes): Properly guard use of gcrypt.h.
---

diff --git a/src/libvirt.c b/src/libvirt.c
index 8a28e4a946..0a21deab3d 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -2,7 +2,7 @@
  * libvirt.c: Main interfaces for the libvirt library to handle virtualization
  *           domains from a process running in domain 0
  *
- * Copyright (C) 2005-2006, 2008-2012 Red Hat, Inc.
+ * Copyright (C) 2005-2006, 2008-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -31,7 +31,6 @@
 #include <unistd.h>
 #include <sys/wait.h>
 #include <time.h>
-#include <gcrypt.h>
 
 #include <libxml/parser.h>
 #include <libxml/xpath.h>
@@ -56,6 +55,7 @@
 #include "intprops.h"
 #include "virconf.h"
 #if WITH_GNUTLS
+# include <gcrypt.h>
 # include "rpc/virnettlscontext.h"
 #endif
 #include "vircommand.h"