[tracker/configure-for-binaries: 15/77] tracker-search-tool: Cleaned up CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit 0470a3df5c7fee2af3898b3c921a5c13be0d6306
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Oct 22 14:36:48 2010 +0100

    tracker-search-tool: Cleaned up CFLAGS/LIBS

 configure.ac                                  |   39 +++++++++++++-----------
 src/tracker-search-tool/Makefile.am           |   18 +++--------
 src/tracker-status-icon/tracker-status-icon.c |    4 ++-
 3 files changed, 29 insertions(+), 32 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f42baf2..c222e6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -345,6 +345,22 @@ TRACKER_WRITEBACK_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
 
 PKG_CHECK_MODULES(TRACKER_WRITEBACK, [$TRACKER_WRITEBACK_REQUIRED])
 
+# Check requirements for tracker-search-tool
+TRACKER_SEARCH_TOOL_REQUIRED="glib-2.0       >= $GLIB_REQUIRED
+                              gio-unix-2.0   >= $GLIB_REQUIRED
+                              gthread-2.0    >= $GLIB_REQUIRED
+                              gmodule-2.0    >= $GLIB_REQUIRED
+                              gtk+-2.0       >= $GTK_REQUIRED
+                              gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED
+                              pango          >= $PANGO_REQUIRED
+                              dbus-1         >= $DBUS_REQUIRED
+                              dbus-glib-1    >= $DBUS_GLIB_REQUIRED
+			      gee-1.0        >= $GEE_REQUIRED"
+
+PKG_CHECK_MODULES(TRACKER_SEARCH_TOOL, [$TRACKER_SEARCH_TOOL_REQUIRED],
+                  [have_tracker_search_tool=yes],
+                  [have_tracker_search_tool=no])
+
 # Check for enca, detects defect Russian or Cyrillic language specifics in mp3s
 AC_ARG_WITH(enca,
             AS_HELP_STRING([--with-enca],
@@ -1316,20 +1332,13 @@ AC_ARG_ENABLE(tracker-search-tool,
                              [enable tracker-search-tool [[default=auto]]]),,
               [enable_tracker_search_tool=auto])
 
-if test "x$enable_tracker_search_tool" != "xno"; then
-   if test "x$have_app_requirements" != "xyes" -o \
-           "x$have_vala_requirements" != "xyes"; then
-      have_tracker_search_tool="no"
-   else
-      have_tracker_search_tool="yes"
-   fi
-else
-   have_tracker_search_tool="no  (disabled)"
-fi
-
 if test "x$enable_tracker_search_tool" = "xyes"; then
    if test "x$have_tracker_search_tool" != "xyes"; then
-      AC_MSG_ERROR([Couldn't find tracker-search-tool dependencies ($APP_REQUIREMENTS $VALA_REQUIREMENTS).])
+      AC_MSG_ERROR([Couldn't find tracker-search-tool dependencies ($TRACKER_SEARCH_TOOL_REQUIRED).])
+   fi
+else
+   if test "xenable_tracker_search_tool" = "xno"; then
+      have_tracker_search_tool="no  (disabled)"
    fi
 fi
 
@@ -1366,12 +1375,6 @@ if test "x$enable_tracker_preferences" = "xyes"; then
    fi
 fi
 
-if test "x$have_tracker_preferences" = "xyes"; then
-   AC_DEFINE(HAVE_TRACKER_PREFERENCES, [1], [Define to 1 if tracker preferences is compiled])
-else
-   AC_DEFINE(HAVE_TRACKER_PREFERENCES, [0], [Define to 0 if tracker preferences is not compiled])
-fi
-
 AM_CONDITIONAL(HAVE_TRACKER_PREFERENCES, test "$have_tracker_preferences" = "yes")
 
 ##################################################################
diff --git a/src/tracker-search-tool/Makefile.am b/src/tracker-search-tool/Makefile.am
index c03239d..8ceb65d 100644
--- a/src/tracker-search-tool/Makefile.am
+++ b/src/tracker-search-tool/Makefile.am
@@ -20,24 +20,16 @@ tracker_search_tool.gs.stamp: $(tracker_search_tool_VALASOURCES)
 	$(VALAC) -C -g --pkg dbus-glib-1 --pkg gee-1.0 --pkg gio-unix-2.0 --pkg gtk+-2.0 $^
 	touch tracker_search_tool.gs.stamp
 
-tracker_search_tool_CFLAGS = \
+tracker_search_tool_CFLAGS = 					\
+	$(BUILD_CFLAGS)						\
 	-DTRACKER_UI_DIR=\"$(datadir)/tracker/\"		\
 	-DSRCDIR=\"$(abs_srcdir)/\"				\
-	$(TRACKER_APPS_CFLAGS)					\
-	$(TRACKER_VALA_CFLAGS)					\
-	$(PANGO_CFLAGS)						\
-	$(GDKPIXBUF_CFLAGS)					\
-	$(WARN_CFLAGS)						\
-	$(GCOV_CFLAGS)						\
 	-include$(top_builddir)/config.h  			\
-	$(NULL)
+	$(TRACKER_SEARCH_TOOL_CFLAGS)
 
 tracker_search_tool_LDADD = 					\
-	$(TRACKER_APPS_LIBS)					\
-	$(TRACKER_VALA_LIBS)					\
-	$(GDKPIXBUF_LIBS)					\
-	$(GCOV_LIBS)						\
-	$(NULL)
+	$(BUILD_LIBS)						\
+	$(TRACKER_SEARCH_TOOL_LIBS)
 
 uidir = $(datadir)/tracker
 ui_DATA = tst.ui
diff --git a/src/tracker-status-icon/tracker-status-icon.c b/src/tracker-status-icon/tracker-status-icon.c
index 795ebb2..8feb202 100644
--- a/src/tracker-status-icon/tracker-status-icon.c
+++ b/src/tracker-status-icon/tracker-status-icon.c
@@ -824,7 +824,7 @@ context_menu_about_cb (GtkMenuItem *item,
 static void
 status_icon_initialize_miners_menu (TrackerStatusIcon *icon)
 {
-	GtkWidget *item, *image;
+	GtkWidget *item;
 	TrackerStatusIconPrivate *priv;
 	GSList *miners, *m;
 
@@ -832,6 +832,8 @@ status_icon_initialize_miners_menu (TrackerStatusIcon *icon)
 
 #if HAVE_TRACKER_SEARCH_TOOL
 	if (g_find_program_in_path ("tracker-search-tool")) {
+		GtkWidget *image;
+
 		item = gtk_image_menu_item_new_with_mnemonic (_("_Search"));
 		image = gtk_image_new_from_icon_name (GTK_STOCK_FIND,
 						      GTK_ICON_SIZE_MENU);