[tracker/rss-enclosures] tracker-explorer: Cleaned up CFLAGS/LIBS

[Roberto Guido <rguido src gnome org>]

commit 5748fca28a23b21f524b790c361fee9be022d16b
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Oct 20 22:17:46 2010 +0100

    tracker-explorer: Cleaned up CFLAGS/LIBS

 configure.ac                     |   33 ++++++++++++++++-----------------
 src/tracker-explorer/Makefile.am |   11 ++++-------
 2 files changed, 20 insertions(+), 24 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fbafb2a..453fa7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -289,6 +289,20 @@ LIBTRACKER_SPARQL_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
 
 PKG_CHECK_MODULES(LIBTRACKER_SPARQL, [$LIBTRACKER_SPARQL_REQUIRED])
 
+# Check requirements for tracker-explorer
+TRACKER_EXPLORER_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
+                           dbus-1       >= $DBUS_REQUIRED
+                           dbus-glib-1  >= $DBUS_GLIB_REQUIRED
+			   gee-1.0      >= $GEE_REQUIRED"
+
+PKG_CHECK_MODULES(TRACKER_EXPLORER, [$TRACKER_EXPLORER_REQUIRED],
+                  [have_tracker_explorer=yes],
+                  [have_tracker_explorer=no])
+
 # Check for enca, detects defect Russian or Cyrillic language specifics in mp3s
 AC_ARG_WITH(enca,
             AS_HELP_STRING([--with-enca],
@@ -1208,26 +1222,11 @@ AC_ARG_ENABLE([tracker-explorer],
               [enable_tracker_explorer=auto])
 
 if test "x$enable_tracker_explorer" != "xno" ; then
-   if test "x$have_app_requirements" != "xyes" -o \
-           "x$have_vala_requirements" != "xyes"; then
-      have_tracker_explorer="no"
-   else
-      have_tracker_explorer="yes"
-   fi
-else
-   have_tracker_explorer="no  (disabled)"
-fi
-
-if test "x$enable_tracker_explorer" = "xyes"; then
    if test "x$have_tracker_explorer" != "xyes"; then
-      AC_MSG_ERROR([Couldn't find tracker-explorer dependencies ($APP_REQUIREMENTS $VALA_REQUIREMENTS).])
+      AC_MSG_ERROR([Couldn't find tracker-explorer dependencies ($TRACKER_EXPLORER_REQUIRED).])
    fi
-fi
-
-if test "x$have_tracker_explorer" = "xyes"; then
-   AC_DEFINE(HAVE_TRACKER_EXPLORER, [1], [Define to 1 if tracker explorer is compiled])
 else
-   AC_DEFINE(HAVE_TRACKER_EXPLORER, [0], [Define to 0 if tracker explorer is not compiled])
+   have_tracker_explorer="no  (disabled)"
 fi
 
 AM_CONDITIONAL(HAVE_TRACKER_EXPLORER, test "$have_tracker_explorer" = "yes")
diff --git a/src/tracker-explorer/Makefile.am b/src/tracker-explorer/Makefile.am
index b9c6db0..8e5d0f8 100644
--- a/src/tracker-explorer/Makefile.am
+++ b/src/tracker-explorer/Makefile.am
@@ -13,17 +13,14 @@ tracker_explorer.vala.stamp: $(tracker_explorer_VALASOURCES)
 	touch tracker_explorer.vala.stamp
 
 tracker_explorer_CFLAGS = 					\
+	$(BUILD_CFLAGS)						\
 	-DTRACKER_UI_DIR=\"$(datadir)/tracker/\"		\
 	-DSRCDIR=\"$(abs_srcdir)/\"				\
-	$(TRACKER_APPS_CFLAGS)					\
-	$(TRACKER_VALA_CFLAGS)					\
-	$(WARN_CFLAGS)						\
-	$(GCOV_CFLAGS)
+	$(TRACKER_EXPLORER_CFLAGS)
 
 tracker_explorer_LDADD = 					\
-	$(TRACKER_APPS_LIBS)					\
-	$(TRACKER_VALA_LIBS)					\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)						\
+	$(TRACKER_EXPLORER_LIBS)
 
 uidir = $(datadir)/tracker
 ui_DATA = tracker-explorer.ui