From: Eric Blake <eblake@redhat.com>
Date: Tue, 21 Aug 2012 20:23:35 +0000 (-0600)
Subject: build: network requires location of dbus headers
X-Git-Tag: v0.10.0-rc1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f97d02d7be53db63aadae3307cc1bcb1c93389a2;p=thirdparty%2Flibvirt.git

build: network requires location of dbus headers

Without this patch, RHEL 5 fails to compile, since the dbus
files lives under /usr/include/dbus-1.0/dbus/dbus.h, and
DBUS_CFLAGS contains -I/usr/include/dbus-1.0.

In file included from network/bridge_driver.c:67:
../src/util/virdbus.h:26:25: error: dbus/dbus.h: No such file or directory

* src/Makefile.am (libvirt_driver_network_impl_la_CFLAGS): Add
DBUS_CFLAGS.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 61b6e09ae4..39cbefda53 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1006,7 +1006,7 @@ noinst_LTLIBRARIES += libvirt_driver_network.la
 endif
 
 libvirt_driver_network_impl_la_CFLAGS = \
-		$(LIBNL_CFLAGS) \
+		$(LIBNL_CFLAGS) $(DBUS_CFLAGS) \
 		-I$(top_srcdir)/src/conf $(AM_CFLAGS) $(DBUS_CFLAGS)
 libvirt_driver_network_impl_la_SOURCES = $(NETWORK_DRIVER_SOURCES)
 endif