[tracker/configure-for-binaries: 4/27] libtracker-direct: Cleaned up CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit 1a9994ca59d20b1b518089f90cc22710d763cce9
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Oct 20 21:30:52 2010 +0100

    libtracker-direct: Cleaned up CFLAGS/LIBS

 configure.ac                      |    8 ++++++++
 src/libtracker-direct/Makefile.am |   12 +++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3b71204..75256db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,6 +227,14 @@ PKG_CHECK_MODULES(LIBTRACKER_DATA, [$LIBTRACKER_DATA_REQUIRED])
 
 LIBTRACKER_DATA_LIBS="$LIBTRACKER_DATA_LIBS -lz -lm"
 
+# Check requirements for libtracker-direct
+LIBTRACKER_DIRECT_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_DIRECT, [$LIBTRACKER_DIRECT_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-direct/Makefile.am b/src/libtracker-direct/Makefile.am
index 148a81e..d32d4f0 100644
--- a/src/libtracker-direct/Makefile.am
+++ b/src/libtracker-direct/Makefile.am
@@ -10,9 +10,8 @@ INCLUDES =								\
 	-I$(top_srcdir)/src/libtracker-data				\
 	-I$(top_builddir)/src						\
 	$(WARN_CFLAGS)							\
-	$(DBUS_CFLAGS)							\
-	$(GLIB2_CFLAGS)							\
-	$(GCOV_CFLAGS)
+	$(GCOV_CFLAGS)							\
+	$(LIBTRACKER_DIRECT_CFLAGS)
 
 modules_LTLIBRARIES = libtracker-direct.la
 
@@ -42,11 +41,10 @@ libtracker-direct.vala.stamp: $(libtracker_direct_la_VALASOURCES) $(vapi_sources
 
 BUILT_SOURCES = libtracker-direct.vala.stamp
 
-libtracker_direct_la_LIBADD = 						\
+libtracker_direct_la_LIBADD = 				\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la	\
-	$(GLIB2_LIBS)						\
-	$(DBUS_LIBS) \
-	$(GCOV_LIBS)
+	$(GCOV_LIBS)					\
+	$(LIBTRACKER_DIRECT_LIBS)
 
 MAINTAINERCLEANFILES =					\
 	$(libtracker_direct_la_VALASOURCES:.vala=.c) 	\