[tracker/configure-for-binaries: 21/23] tracker-miner-rss: Cleaned up CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit 659e197defcbe181fd8d71c8b606ba1e303f63ad
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Oct 22 16:25:37 2010 +0100

    tracker-miner-rss: Cleaned up CFLAGS/LIBS

 configure.ac               |   36 +++++++++++++++++++-----------------
 data/Makefile.am           |    2 +-
 data/dbus/Makefile.am      |    2 +-
 data/miners/Makefile.am    |    2 +-
 src/miners/Makefile.am     |    2 +-
 src/miners/rss/Makefile.am |   12 ++++--------
 6 files changed, 27 insertions(+), 29 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 36bec1d..f56c074 100644
--- a/configure.ac
+++ b/configure.ac
@@ -342,6 +342,16 @@ PKG_CHECK_MODULES(TRACKER_MINER_FS, [$TRACKER_MINER_FS_REQUIRED])
 
 TRACKER_MINER_FS_LIBS="$TRACKER_MINER_FS_LIBS -lz -lm"
 
+# Check requirements for tracker-miner-rss
+TRACKER_MINER_RSS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                            dbus-1       >= $DBUS_REQUIRED
+                            dbus-glib-1  >= $DBUS_GLIB_REQUIRED
+                            libgrss-0    >= $LIBGRSS_REQUIRED"
+
+PKG_CHECK_MODULES(TRACKER_MINER_RSS, [$TRACKER_MINER_RSS_REQUIRED],
+                  [have_tracker_miner_rss=yes],
+                  [have_tracker_miner_rss=no])
+
 # Check requirements for tracker-utils
 TRACKER_UTILS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
                         gio-unix-2.0 >= $GLIB_REQUIRED
@@ -1238,27 +1248,19 @@ AM_CONDITIONAL(HAVE_MINER_EVOLUTION, test "x$have_miner_evolution" = "xyes")
 AC_ARG_ENABLE([miner_rss],
               AS_HELP_STRING([--enable-miner-rss],
                              [enable RSS data miner [[default=auto]]]),,
-              [enable_miner_rss=auto])
-
-if test "x$enable_miner_rss" != "xno" ; then
-   PKG_CHECK_MODULES(LIBGRSS,
-                     [libgrss-0 >= $LIBGRSS_REQUIRED],
-                     [have_miner_rss=yes],
-                     [have_miner_rss=no])
+              [enable_tracker_miner_rss=auto])
 
-   AC_SUBST(MINER_RSS_CFLAGS)
-   AC_SUBST(MINER_RSS_LIBS)
+if test "x$enable_tracker_miner_rss" = "xyes" ; then
+   if test "x$have_tracker_miner_rss" != "xyes"; then
+      AC_MSG_ERROR([Couldn't find tracker-miner-rss dependencies ($TRACKER_MINER_RSS_REQUIRED).])
+   fi
 else
-   have_miner_rss="no  (disabled)"
-fi
-
-if test "x$enable_miner_rss" = "xyes"; then
-   if test "x$have_miner_rss" != "xyes"; then
-      AC_MSG_ERROR([Couldn't find libgrss >= $LIBGRSS_REQUIRED for RSS miner.])
+   if test "x$enable_tracker_miner_rss" = "xno" ; then
+      have_tracker_miner_rss="no  (disabled)"
    fi
 fi
 
-AM_CONDITIONAL(HAVE_MINER_RSS, test "x$have_miner_rss" = "xyes")
+AM_CONDITIONAL(HAVE_TRACKER_MINER_RSS, test "x$have_tracker_miner_rss" = "xyes")
 
 ####################################################################
 # Application and Vala requirements
@@ -2181,7 +2183,7 @@ Data Miners:
 
 	Applications:                           yes
           MeeGo                                 $have_meegotouch
-	RSS:                                    $have_miner_rss
+	RSS:                                    $have_tracker_miner_rss
 	Evolution:                              $have_miner_evolution ($evolution_plugins_dir)
 	Flickr:                                 $have_miner_flickr
 
diff --git a/data/Makefile.am b/data/Makefile.am
index cbc9aa2..44ccde1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -48,7 +48,7 @@ if HAVE_TRACKER_STATUS_ICON
 autostart_DATA += tracker-status-icon.desktop
 endif
 
-if HAVE_MINER_RSS
+if HAVE_TRACKER_MINER_RSS
 autostart_DATA += tracker-miner-rss.desktop
 endif
 
diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am
index d5d58f3..292e25d 100644
--- a/data/dbus/Makefile.am
+++ b/data/dbus/Makefile.am
@@ -40,7 +40,7 @@ if HAVE_MINER_EVOLUTION
 service_DATA += org.freedesktop.Tracker1.Miner.EMails.service
 endif
 
-if HAVE_MINER_RSS
+if HAVE_TRACKER_MINER_RSS
 service_DATA += org.freedesktop.Tracker1.Miner.RSS.service
 endif
 
diff --git a/data/miners/Makefile.am b/data/miners/Makefile.am
index a09226e..8a9c25a 100644
--- a/data/miners/Makefile.am
+++ b/data/miners/Makefile.am
@@ -24,7 +24,7 @@ if HAVE_MINER_EVOLUTION
 tracker_miners_DATA += tracker-miner-evolution.desktop
 endif
 
-if HAVE_MINER_RSS
+if HAVE_TRACKER_MINER_RSS
 tracker_miners_DATA += tracker-miner-rss.desktop
 endif
 
diff --git a/src/miners/Makefile.am b/src/miners/Makefile.am
index 6d21c25..8b403b1 100644
--- a/src/miners/Makefile.am
+++ b/src/miners/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = fs
 
-if HAVE_MINER_RSS
+if HAVE_TRACKER_MINER_RSS
 SUBDIRS += rss
 endif
 
diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am
index 096e64e..1a68cfb 100644
--- a/src/miners/rss/Makefile.am
+++ b/src/miners/rss/Makefile.am
@@ -12,10 +12,8 @@ INCLUDES =								\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-sparql				\
 	$(WARN_CFLAGS)							\
-	$(GMODULE_CFLAGS)						\
-	$(DBUS_CFLAGS)							\
-	$(LIBGRSS_CFLAGS)						\
-	$(GCOV_CFLAGS)
+	$(GCOV_CFLAGS)							\
+	$(TRACKER_MINER_RSS_CFLAGS)
 
 libexec_PROGRAMS = tracker-miner-rss
 
@@ -28,7 +26,5 @@ tracker_miner_rss_LDADD =						\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la	\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(LIBGRSS_LIBS)							\
-	$(DBUS_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(GTHREAD_LIBS)
+	$(GCOV_LIBS)							\
+	$(TRACKER_MINER_RSS_LIBS)