aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Gateau <aurelien.gateau@canonical.com>2010-07-19 17:21:38 +0200
committerAurelien Gateau <aurelien.gateau@canonical.com>2010-07-19 17:21:38 +0200
commit6da7a3341f028d913fd3ad01d47a59f436b5e780 (patch)
treef0214712d5b645b300e71cf8b4f4eaf0f173e48d
parent9f4213d9d59c84c9c4811a69ee50d4baaab6dc58 (diff)
downloadlibdbusmenu-6da7a3341f028d913fd3ad01d47a59f436b5e780.tar.gz
libdbusmenu-6da7a3341f028d913fd3ad01d47a59f436b5e780.tar.bz2
libdbusmenu-6da7a3341f028d913fd3ad01d47a59f436b5e780.zip
Use pkgconfig to find libx11
-rw-r--r--configure.ac9
-rw-r--r--tools/Makefile.am4
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
@@ -51,6 +51,15 @@ 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