[tracker/configure-for-binaries: 5/80] libtracker-extract: Clean up CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit 46e1626f59076dfd66109cfaf4557405470458b2
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Oct 20 21:34:52 2010 +0100

    libtracker-extract: Clean up CFLAGS/LIBS

 configure.ac                       |    8 ++++++++
 src/libtracker-extract/Makefile.am |    6 ++----
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2c99864..2b4ea40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -241,6 +241,14 @@ LIBTRACKER_DIRECT_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
 
 PKG_CHECK_MODULES(LIBTRACKER_DIRECT, [$LIBTRACKER_DIRECT_REQUIRED])
 
+# Check requirements for libtracker-extract
+LIBTRACKER_EXTRACT_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_EXTRACT, [$LIBTRACKER_EXTRACT_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-extract/Makefile.am b/src/libtracker-extract/Makefile.am
index 96e927e..e056ef0 100644
--- a/src/libtracker-extract/Makefile.am
+++ b/src/libtracker-extract/Makefile.am
@@ -8,9 +8,8 @@ INCLUDES =						\
 	-I$(top_builddir)/src				\
 	-I$(top_builddir)/src/libtracker-sparql		\
 	$(WARN_CFLAGS)					\
-	$(GLIB2_CFLAGS)					\
 	$(GCOV_CFLAGS)					\
-	$(GIO_CFLAGS)					\
+	$(LIBTRACKER_EXTRACT_CFLAGS)			\
 	$(LIBIPTCDATA_CFLAGS)				\
 	$(LIBEXIF_CFLAGS) 				\
 	$(EXEMPI_CFLAGS)
@@ -46,9 +45,8 @@ libtracker_extract_ TRACKER_API_VERSION@_la_LDFLAGS = 	\
 libtracker_extract_ TRACKER_API_VERSION@_la_LIBADD = 	\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(GIO_LIBS)					\
 	$(GCOV_LIBS)					\
-	$(GLIB2_LIBS)					\
+	$(LIBTRACKER_EXTRACT_LIBS)			\
 	$(LIBIPTCDATA_LIBS)				\
 	$(LIBEXIF_LIBS)					\
 	$(EXEMPI_LIBS)