[tracker/configure-for-binaries: 6/14] libtracker-fts: Cleaned up CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit b4a01c10243d4dd1aaaf7b180e4e1dbf1f5534e1
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Oct 20 21:45:00 2010 +0100

    libtracker-fts: Cleaned up CFLAGS/LIBS

 configure.ac                   |   23 ++++++++++++++++-------
 src/libtracker-fts/Makefile.am |   11 ++---------
 2 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7ff863e..2ab8db7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,6 +162,12 @@ LIBGRSS_REQUIRED=0.3
 REST_REQUIRED=0.6
 NETWORK_MANAGER_REQUIRED=0.8
 
+# 3.6.11 for sqlite_backup API
+# 3.6.16 to fix test failures
+# 3.6.17 for shared cache mode with virtual tables
+# 3.7.0 for WAL
+SQLITE_REQUIRED=3.7.0
+
 # Library Checks
 PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED])
 AC_SUBST(GLIB2_CFLAGS)
@@ -243,6 +249,16 @@ LIBTRACKER_EXTRACT_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
 
 PKG_CHECK_MODULES(LIBTRACKER_EXTRACT, [$LIBTRACKER_EXTRACT_REQUIRED])
 
+# Check requirements for libtracker-fts
+LIBTRACKER_FTS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                         gio-unix-2.0 >= $GLIB_REQUIRED
+                         gthread-2.0  >= $GLIB_REQUIRED
+                         dbus-1       >= $DBUS_REQUIRED
+                         dbus-glib-1  >= $DBUS_GLIB_REQUIRED
+                         sqlite3      >= $SQLITE_REQUIRED"
+
+PKG_CHECK_MODULES(LIBTRACKER_FTS, [$LIBTRACKER_FTS_REQUIRED])
+
 # Check for enca, detects defect Russian or Cyrillic language specifics in mp3s
 AC_ARG_WITH(enca,
             AS_HELP_STRING([--with-enca],
@@ -789,13 +805,6 @@ fi
 #  SQLite check
 ####################################################################
 
-# 3.6.11 for sqlite_backup API
-# 3.6.16 to fix test failures
-# 3.6.17 for shared cache mode with virtual tables
-# 3.7.0 for WAL
-
-SQLITE_REQUIRED=3.7.0
-
 PKG_CHECK_MODULES(SQLITE3, [sqlite3 >= $SQLITE_REQUIRED])
 AC_SUBST(SQLITE3_CFLAGS)
 AC_SUBST(SQLITE3_LIBS)
diff --git a/src/libtracker-fts/Makefile.am b/src/libtracker-fts/Makefile.am
index 02032f6..4b5fe43 100644
--- a/src/libtracker-fts/Makefile.am
+++ b/src/libtracker-fts/Makefile.am
@@ -5,11 +5,8 @@ INCLUDES =								\
 	-DTRACKER_COMPILATION						\
 	-DNDEBUG							\
 	$(WARN_CFLAGS)							\
-	$(GLIB2_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
-	$(DBUS_CFLAGS)							\
-	$(UNAC_CFLAGS)							\
-	$(SQLITE3_CFLAGS)						\
+	$(LIBTRACKER_FTS_CFLAGS)					\
 	$(UNICODE_SUPPORT_CFLAGS)
 
 noinst_LTLIBRARIES = libtracker-fts.la
@@ -37,10 +34,6 @@ endif
 
 libtracker_fts_la_LIBADD =						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(SQLITE3_LIBS)							\
-	$(DBUS_LIBS)							\
-	$(GTHREAD_LIBS)							\
 	$(GCOV_LIBS)							\
-	$(UNAC_LIBS)							\
-	$(GLIB2_LIBS)							\
+	$(LIBTRACKER_FTS_LIBS)						\
 	$(UNICODE_SUPPORT_LIBS)