From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Wed, 20 Jan 2010 17:32:43 +0000 (+0000)
Subject: xenpm: Use pkgconfig to get cflags and ldflags
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=99431de1227a278812e52dad050bf3738cbf6df4;p=xenclient%2Fxen-pq.git

xenpm: Use pkgconfig to get cflags and ldflags
---

diff --git a/master/series b/master/series
index 7778173..c455fb7 100644
--- a/master/series
+++ b/master/series
@@ -35,3 +35,4 @@ reset-atapi-after-failed-cd-boot
 vga-edid
 tboot-xen-fixes-01082010.patch
 guest-os-controlled-brightness-support
+xenpm-use-pkgconfig
diff --git a/master/xenpm-use-pkgconfig b/master/xenpm-use-pkgconfig
new file mode 100644
index 0000000..18c9fad
--- /dev/null
+++ b/master/xenpm-use-pkgconfig
@@ -0,0 +1,16 @@
+diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile
+index bf335af..be12894 100644
+--- a/tools/xenpmd/Makefile
++++ b/tools/xenpmd/Makefile
+@@ -3,9 +3,9 @@ include $(XEN_ROOT)/tools/Rules.mk
+ 
+ CFLAGS  += -Werror
+ CFLAGS  += $(CFLAGS_libxenstore)
+-CFLAGS  += -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
++CFLAGS  += $(shell pkg-config dbus-glib-1 --cflags)
+ LDFLAGS += $(LDFLAGS_libxenstore)
+-LDFLAGS += -ldbus-glib-1 -ldbus-1 -lpthread -lgobject-2.0 -lglib-2.0 -lintl
++LDFLAGS += $(shell pkg-confing dbus-glib-1 --libs) -lpthread -lintl
+ 
+ BIN      = xenpmd
+