From 6da7a3341f028d913fd3ad01d47a59f436b5e780 Mon Sep 17 00:00:00 2001
From: Aurelien Gateau <aurelien.gateau@canonical.com>
Date: Mon, 19 Jul 2010 17:21:38 +0200
Subject: Use pkgconfig to find libx11

---
 configure.ac      | 9 +++++++++
 tools/Makefile.am | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b88d96d..99911fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,15 @@ PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
 AC_SUBST(DBUSMENUGTK_CFLAGS)
 AC_SUBST(DBUSMENUGTK_LIBS)
 
+###########################
+# Dependencies - tools
+###########################
+
+PKG_CHECK_MODULES(DBUSMENUTOOLS, x11)
+
+AC_SUBST(DBUSMENUTOOLS_CFLAGS)
+AC_SUBST(DBUSMENUTOOLS_LIBS)
+
 ###########################
 # Dependencies - Testing
 ###########################
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a36d224..3cd5538 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,11 +10,11 @@ dbusmenu_dumper_SOURCES = \
 
 dbusmenu_dumper_CFLAGS = \
 	-I $(srcdir)/.. \
-	$(DBUSMENUGLIB_CFLAGS) -I/usr/include/dbus-1.0 -Wall -Werror
+	$(DBUSMENUGLIB_CFLAGS) $(DBUSMENUTOOLS_CFLAGS) -Wall -Werror
 
 dbusmenu_dumper_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
-	$(DBUSMENUGLIB_LIBS) -lX11 -ldbus-glib-1
+	$(DBUSMENUGLIB_LIBS) $(DBUSMENUTOOLS_LIBS)
 
 doc_DATA = README.dbusmenu-bench
 
-- 
cgit v1.2.3