From: Eric Blake <eblake@redhat.com>
Date: Thu, 20 Nov 2014 15:48:19 +0000 (-0700)
Subject: build: fix build when not using dbus
X-Git-Tag: CVE-2014-8135~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be90aa002621a6f0693f56aa5421186ca94c169e;p=thirdparty%2Flibvirt.git

build: fix build when not using dbus

Commit c0e7022 breaks on a machine that lacks dbus headers:

In file included from util/virdbus.c:24:0:
util/virdbuspriv.h:31:3: error: unknown type name 'dbus_int16_t'

* src/util/virdbuspriv.h (DBusBasicValue): Only provide fallback
when dbus is compiled.

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

diff --git a/src/util/virdbuspriv.h b/src/util/virdbuspriv.h
index 424774659e..74b395f70d 100644
--- a/src/util/virdbuspriv.h
+++ b/src/util/virdbuspriv.h
@@ -24,7 +24,7 @@
 
 # include "virdbus.h"
 
-# if !HAVE_DBUSBASICVALUE
+# if defined(WITH_DBUS) && !HAVE_DBUSBASICVALUE
 /* Copied (and simplified) from dbus 1.6.12, for use with older dbus headers */
 typedef union
 {