[tracker/configure-for-binaries: 17/77] tracker-status-icon: Cleaned up CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit f1d2872953c8319ccd705d85ab2db50b51f0ccaa
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Oct 22 15:55:39 2010 +0100

    tracker-status-icon: Cleaned up CFLAGS/LIBS

 configure.ac                        |   32 +++++++++++++++++++++-----------
 src/tracker-status-icon/Makefile.am |   17 ++++++-----------
 2 files changed, 27 insertions(+), 22 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 71d57b4..9ca8e02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -374,6 +374,22 @@ PKG_CHECK_MODULES(TRACKER_PREFERENCES, [$TRACKER_PREFERENCES_REQUIRED],
                   [have_tracker_preferences=yes],
                   [have_tracker_preferences=no])
 
+# Check requirements for tracker-status-icon
+TRACKER_STATUS_ICON_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
+                              pango          >= $PANGO_REQUIRED
+                              dbus-1         >= $DBUS_REQUIRED
+                              dbus-glib-1    >= $DBUS_GLIB_REQUIRED"
+
+PKG_CHECK_MODULES(TRACKER_STATUS_ICON, [$TRACKER_STATUS_ICON_REQUIRED],
+                  [have_tracker_status_icon=yes],
+                  [have_tracker_status_icon=no])
+
+TRACKER_STATUS_ICON_LIBS="$TRACKER_STATUS_ICON_LIBS -lX11"
+
 # Check for enca, detects defect Russian or Cyrillic language specifics in mp3s
 AC_ARG_WITH(enca,
             AS_HELP_STRING([--with-enca],
@@ -1259,19 +1275,13 @@ AC_ARG_ENABLE([tracker-status-icon],
                              [enable tracker-status-icon [[default=auto]]]),,
               [enable_tracker_status_icon=auto])
 
-if test "x$enable_tracker_status_icon" != "xno" ; then
-   if test "x$have_app_requirements" != "xyes"; then
-      have_tracker_status_icon="no"
-   else
-      have_tracker_status_icon="yes"
+if test "x$enable_tracker_status_icon" = "xyes" ; then
+   if test "x$have_tracker_status_icon" != "xyes"; then
+      AC_MSG_ERROR([Couldn't find tracker-status-icon dependencies ($TRACKER_STATUS_ICON_REQUIRED).])
    fi
 else
-   have_tracker_status_icon="no  (disabled)"
-fi
-
-if test "x$enable_tracker_status_icon" = "xyes"; then
-   if test "x$have_tracker_status_icon" != "xyes"; then
-      AC_MSG_ERROR([Couldn't find tracker-status-icon dependencies ($APP_REQUIREMENTS).])
+   if test "x$enable_tracker_status_icon" = "xno" ; then
+      have_tracker_status_icon="no  (disabled)"
    fi
 fi
 
diff --git a/src/tracker-status-icon/Makefile.am b/src/tracker-status-icon/Makefile.am
index 7964b5c..21eb5c9 100644
--- a/src/tracker-status-icon/Makefile.am
+++ b/src/tracker-status-icon/Makefile.am
@@ -1,17 +1,14 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =								\
+	$(BUILD_CFLAGS)							\
+	-I$(top_srcdir)/src						\
+	-I$(top_builddir)/src						\
 	-DICONS_DIR=\""$(datadir)/tracker/icons/"\"			\
 	-DSHAREDIR=\""$(datadir)"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
 	-DTRACKER_LIBEXECDIR=\""$(libexecdir)"\" 			\
-	-DTRACKER_COMPILATION						\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
-	$(TRACKER_APPS_CFLAGS)						\
-	$(PANGO_CFLAGS)							\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)
+	$(TRACKER_STATUS_ICON_CFLAGS)
 
 bin_PROGRAMS = tracker-status-icon
 
@@ -20,10 +17,8 @@ tracker_status_icon_LDADD = 						\
 	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la 	\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(TRACKER_APPS_LIBS)						\
-	$(PANGO_LIBS)							\
-	$(GCOV_LIBS)							\
-	-lX11
+	$(BUILD_LIBS)							\
+	$(TRACKER_STATUS_ICON_LIBS)
 
 tracker_status_icon_SOURCES =						\
 	tomboykeybinder.c						\