[tracker/configure-for-binaries: 2/14] libtracker-common: Clean up CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit 13007b84dc69e393f57df029be02b50e2d442029
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Oct 20 08:52:00 2010 +0100

    libtracker-common: Clean up CFLAGS/LIBS

 configure.ac                      |    7 +++++++
 src/libtracker-common/Makefile.am |   12 ++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a017cf0..88dd613 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,6 +209,13 @@ LIBTRACKER_BUS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
                          dbus-glib-1  >= $DBUS_GLIB_REQUIRED"
 PKG_CHECK_MODULES(LIBTRACKER_BUS, [$LIBTRACKER_BUS_REQUIRED])
 
+# Check requirements for libtracker-common
+LIBTRACKER_COMMON_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_COMMON, [$LIBTRACKER_COMMON_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-common/Makefile.am b/src/libtracker-common/Makefile.am
index e6ebd17..8e5027f 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -6,12 +6,10 @@ INCLUDES =						\
 	-DTRACKER_COMPILATION				\
 	-I$(top_srcdir)/src				\
 	$(WARN_CFLAGS)					\
-	$(GLIB2_CFLAGS)					\
 	$(GCOV_CFLAGS)					\
-	$(GIO_CFLAGS)					\
 	$(HAL_CFLAGS)					\
 	$(UPOWER_CFLAGS)				\
-	$(DBUS_CFLAGS)
+	$(LIBTRACKER_COMMON_CFLAGS)
 
 libtracker_commondir = $(libdir)/tracker-$(TRACKER_API_VERSION)
 libtracker_common_LTLIBRARIES = libtracker-common.la
@@ -79,12 +77,10 @@ libtracker_common_la_LDFLAGS = 				\
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 libtracker_common_la_LIBADD = 				\
-	$(HAL_LIBS)					\
-	$(UPOWER_LIBS)					\
-	$(DBUS_LIBS)					\
-	$(GIO_LIBS)					\
 	$(GCOV_LIBS)					\
-	$(GLIB2_LIBS)
+	$(LIBTRACKER_COMMON_LIBS)			\
+	$(HAL_LIBS)					\
+	$(UPOWER_LIBS)
 
 if HAVE_TRACKER_FTS
 libtracker_common_la_LIBADD += 				\