[tracker] Do not require libgee

[Jürg Billeter <juergbi src gnome org>]

commit b59fc142d9c4d246f72fb54324f160ba490da31c
Author: Jürg Billeter <j bitron ch>
Date:   Mon Jul 13 08:45:57 2009 +0200

    Do not require libgee

 configure.ac                     |   12 ++++--------
 src/tracker-explorer/Makefile.am |   12 ++----------
 2 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 55dda36..d204634 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,6 +153,7 @@ STREAMANALYZER_REQUIRED=9.9.9
 LIBGNOME_DESKTOP_REQUIRED=2.9.91
 LIBGNOME_REQUIRED=2.13.2
 LIBGNOMEUI_REQUIRED=2.13.7
+GEE_REQUIRED=0.1.3
 
 # Library Checks
 PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED])
@@ -198,12 +199,6 @@ PKG_CHECK_MODULES(LIBPNG, [libpng >= 1.2])
 AC_SUBST(LIBPNG_CFLAGS)
 AC_SUBST(LIBPNG_LIBS)
 
-# Check for libgee 0.1.3 or higher
-PKG_CHECK_MODULES(LIBGEE, [gee-1.0 >= 0.1.3])
-AC_SUBST(LIBGEE_CFLAGS)
-AC_SUBST(LIBGEE_LIBS)
-
-
 # Check for GConf
 PKG_CHECK_MODULES(GCONF, [gconf-2.0 >= 2.2.0], have_gconf=yes, have_gconf=no)
 AC_SUBST(GCONF_CFLAGS)
@@ -813,7 +808,8 @@ if test "x$enable_tracker_explorer" != "xno" ; then
 		glib-2.0    >= $GLIB_REQUIRED
 		gtk+-2.0    >= $GTK_REQUIRED
 		dbus-1      >= $DBUS_REQUIRED
-		dbus-glib-1 >= $DBUS_REQUIRED],
+		dbus-glib-1 >= $DBUS_REQUIRED
+		gee-1.0     >= $GEE_REQUIRED],
 		[have_tracker_explorer=yes],
 		[have_tracker_explorer=no])
 
@@ -825,7 +821,7 @@ 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 (glib-2.0 >= $GLIB_REQUIRED, gtk+-2.0 >= $GTK_REQUIRED, dbus-1 >= $DBUS_REQUIRED, dbus-glib-1 >= $DBUS_REQUIRED).])
+      AC_MSG_ERROR([Couldn't find tracker-explorer dependencies (glib-2.0 >= $GLIB_REQUIRED, gtk+-2.0 >= $GTK_REQUIRED, dbus-1 >= $DBUS_REQUIRED, dbus-glib-1 >= $DBUS_REQUIRED, gee-1.0 >= $GEE_REQUIRED).])
    fi
 fi
 
diff --git a/src/tracker-explorer/Makefile.am b/src/tracker-explorer/Makefile.am
index fd3e1ef..5e1c8e2 100644
--- a/src/tracker-explorer/Makefile.am
+++ b/src/tracker-explorer/Makefile.am
@@ -19,21 +19,13 @@ tracker_explorer_CFLAGS = \
 	-DTRACKER_UI_DIR=\"$(datadir)/tracker/\"		\
 	-DSRCDIR=\"$(abs_srcdir)/\"				\
 	$(WARN_CFLAGS)						\
-	$(GLIB2_CFLAGS)						\
 	$(GCOV_CFLAGS)						\
-	$(GIO_CFLAGS)						\
-	$(DBUS_CFLAGS)						\
-	$(LIBTRACKERGTK_CFLAGS)					\
-	$(LIBGEE_CFLAGS)					\
+	$(TRACKER_EXPLORER_CFLAGS)				\
 	$(NULL)
 
 tracker_explorer_LDADD = \
-	$(GLIB2_LIBS)						\
-	$(GIO_LIBS)						\
 	$(GCOV_LIBS)						\
-	$(DBUS_LIBS)						\
-	$(LIBTRACKERGTK_LIBS)					\
-	$(LIBGEE_LIBS)						\
+	$(TRACKER_EXPLORER_LIBS)				\
 	$(NULL)
 
 uidir = $(datadir)/tracker