[libvirt] Hard requirement on gcrypt.h?

[Eugene Marcotte]

On Tue, 2013-02-26 at 16:42 -0700, Eric Blake wrote:
> Ah, I see now - the file in question is src/libvirt.c - the typo of
> libirt.c threw me off.

Sorry about that. 

> I think we are guaranteed that gcrypt.h exists if gnutls is properly
> installed, even if it is a transitive dependency.  Does this patch fix
> it for you?

Yup, at least when building without gnutls it works fine. When building
with gnutls (e.g. after yum install gnutls-devel) it also works fine.

Thanks!

> diff --git i/src/libvirt.c w/src/libvirt.c
> index 8a28e4a..0a21dea 100644
> --- i/src/libvirt.c
> +++ w/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"
> 
>