[tracker/configure-for-binaries: 18/77] tracker-search-bar: Cleaned up CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit a4734794b594fc1e0afa6ddb6dc4e6b3ce02f52c
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Oct 22 16:02:54 2010 +0100

    tracker-search-bar: Cleaned up CFLAGS/LIBS

 configure.ac                       |   40 +++++++++++++++++++----------------
 src/tracker-search-bar/Makefile.am |   14 ++++--------
 2 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9ca8e02..241601f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -390,6 +390,23 @@ PKG_CHECK_MODULES(TRACKER_STATUS_ICON, [$TRACKER_STATUS_ICON_REQUIRED],
 
 TRACKER_STATUS_ICON_LIBS="$TRACKER_STATUS_ICON_LIBS -lX11"
 
+# Check requirements for tracker-search-bar
+TRACKER_SEARCH_BAR_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
+                             libpanelapplet-2.0"
+
+PKG_CHECK_MODULES(TRACKER_SEARCH_BAR, [$TRACKER_SEARCH_BAR_REQUIRED],
+                  [have_tracker_search_bar=yes],
+                  [have_tracker_search_bar=no])
+
 # Check for enca, detects defect Russian or Cyrillic language specifics in mp3s
 AC_ARG_WITH(enca,
             AS_HELP_STRING([--with-enca],
@@ -1321,27 +1338,14 @@ AC_ARG_ENABLE([tracker-search-bar],
                              [enable tracker-search-bar[[default=auto]]]),,
               [enable_tracker_search_bar=auto])
 
-if test "x$enable_tracker_search_bar" != "xno" ; then
-   if test "x$have_app_requirements" != "xyes" -o \
-           "x$have_applet_requirements" != "xyes"; then
-      have_tracker_search_bar="no"
-   else
-      have_tracker_search_bar="yes"
-   fi
-else
-   have_tracker_search_bar="no  (disabled)"
-fi
-
-if test "x$enable_tracker_search_bar" = "xyes"; then
+if test "x$enable_tracker_search_bar" = "xyes" ; then
    if test "x$have_tracker_search_bar" != "xyes"; then
-      AC_MSG_ERROR([Couldn't find tracker-search-bar dependencies ($APP_REQUIREMENTS $APPLET_REQUIREMENTS).])
+      AC_MSG_ERROR([Couldn't find tracker-search-bar dependencies ($TRACKER_SEARCH_BAR_REQUIRED).])
    fi
-fi
-
-if test "x$have_tracker_search_bar" = "xyes"; then
-   AC_DEFINE(HAVE_TRACKER_SEARCH_BAR, [1], [Define to 1 if t-s-b is compiled])
 else
-   AC_DEFINE(HAVE_TRACKER_SEARCH_BAR, [0], [Define to 0 if t-s-b is not compiled])
+   if test "x$enable_tracker_search_bar" = "xno"; then
+      have_tracker_search_bar="no  (disabled)"
+   fi
 fi
 
 AM_CONDITIONAL(HAVE_TRACKER_SEARCH_BAR, test "$have_tracker_search_bar" = "yes")
diff --git a/src/tracker-search-bar/Makefile.am b/src/tracker-search-bar/Makefile.am
index ff7e519..98ed439 100644
--- a/src/tracker-search-bar/Makefile.am
+++ b/src/tracker-search-bar/Makefile.am
@@ -18,19 +18,15 @@ tracker_search_bar_CFLAGS = \
 	-I$(top_srcdir)/src					\
 	-I$(top_builddir)/src					\
 	-I$(top_builddir)/src/libtracker-client			\
-	$(TRACKER_APPS_CFLAGS)					\
-	$(TRACKER_APPLETS_CFLAGS)				\
-	$(GDKPIXBUF_CFLAGS)					\
 	$(WARN_CFLAGS)						\
-	$(GCOV_CFLAGS)
+	$(GCOV_CFLAGS)						\
+	$(TRACKER_SEARCH_BAR_CFLAGS)
 
 tracker_search_bar_LDADD = 					\
 	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(TRACKER_APPS_LIBS)					\
-	$(TRACKER_APPLETS_LIBS)					\
-	$(GDKPIXBUF_LIBS)					\
-	$(GCOV_LIBS)
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(GCOV_LIBS)						\
+	$(TRACKER_SEARCH_BAR_LIBS)
 
 uidir = $(datadir)/tracker
 ui_DATA = tracker-search-bar.ui