[tracker/configure-for-binaries: 1/23] libtracker-bus: Clean up CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit a966b207d3906082407f271e69480bae0b6a8911
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Oct 20 08:45:31 2010 +0100

    libtracker-bus: Clean up CFLAGS/LIBS

 configure.ac                   |    7 +++++++
 src/libtracker-bus/Makefile.am |   16 ++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 544de34..2f026d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,6 +202,13 @@ PKG_CHECK_MODULES(UUID, [uuid])
 AC_SUBST(UUID_CFLAGS)
 AC_SUBST(UUID_LIBS)
 
+# Check requirements for libtracker-bus
+LIBTRACKER_BUS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                         gio-unix-2.0 >= $GLIB_REQUIRED
+                         dbus-1       >= $DBUS_REQUIRED
+                         dbus-glib-1  >= $DBUS_GLIB_REQUIRED"
+PKG_CHECK_MODULES(LIBTRACKER_BUS, [$LIBTRACKER_BUS_REQUIRED])
+
 # Check for enca, detects defect Russian or Cyrillic language specifics in mp3s
 AC_ARG_WITH(enca,
             AS_HELP_STRING([--with-enca],
diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am
index fcb2282..2ede78d 100644
--- a/src/libtracker-bus/Makefile.am
+++ b/src/libtracker-bus/Makefile.am
@@ -10,10 +10,8 @@ INCLUDES =								\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-sparql				\
 	$(WARN_CFLAGS)							\
-	$(DBUS_CFLAGS)							\
-	$(GLIB2_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
-	$(GIO_CFLAGS)
+	$(LIBTRACKER_BUS_CFLAGS)
 
 modules_LTLIBRARIES = libtracker-bus.la
 
@@ -50,13 +48,11 @@ libtracker-bus.vala.stamp: $(libtracker_bus_la_VALASOURCES) $(vapi_sources)
 
 BUILT_SOURCES = libtracker-bus.vala.stamp
 
-libtracker_bus_la_LIBADD = 						\
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la 	\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(GLIB2_LIBS) \
-	$(DBUS_LIBS) \
-	$(GCOV_LIBS) \
-	$(GIO_LIBS)
+libtracker_bus_la_LIBADD = 				\
+	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(GCOV_LIBS) 					\
+	$(LIBTRACKER_BUS_LIBS)
 
 MAINTAINERCLEANFILES =					\
 	$(libtracker_bus_la_VALASOURCES:.vala=.c) 	\