[tracker/tracker-0.10] libtracker-sparql: Remove GConf dependency



commit e717fba45c27a27d362c43ea2e710a6205900dd8
Author: Philip Van Hoof <philip codeminded be>
Date:   Fri Apr 1 17:36:30 2011 +0200

    libtracker-sparql: Remove GConf dependency
    
    In Maemo's case we're now reading from gconf-dbus using GDBus
    directly, instead of using the non-thread-safe gconfclient API

 configure.ac                         |   16 ----------------
 src/libtracker-sparql/Makefile.am    |    3 +--
 src/libtracker-sparql/tracker-init.c |   20 --------------------
 3 files changed, 1 insertions(+), 38 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d10b51a..010302a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -597,23 +597,7 @@ AC_ARG_ENABLE(maemo,
 AM_CONDITIONAL(HAVE_MAEMO, test "x$enable_maemo" = "xyes")
 
 if test "x$enable_maemo" = "xyes" ; then
-
    AC_DEFINE(HAVE_MAEMO, 1, [Define if we enable Maemo specific features])
-
-   PKG_CHECK_MODULES(GCONF,
-                     [gconf-2.0],
-                     [have_gconf=yes],
-                     [have_gconf=no])
-
-   LIBTRACKER_COMMON_CFLAGS="$LIBTRACKER_COMMON_CFLAGS $GCONF_CFLAGS"
-   LIBTRACKER_COMMON_LIBS="$LIBTRACKER_COMMON_LIBS $GCONF_LIBS"
-
-   LIBTRACKER_SPARQL_CFLAGS="$LIBTRACKER_SPARQL_CFLAGS $GCONF_CFLAGS"
-   LIBTRACKER_SPARQL_LIBS="$LIBTRACKER_SPARQL_LIBS $GCONF_LIBS"
-
-   if test "x$have_gconf" != "xyes"; then
-      AC_MSG_ERROR([Couldn't find gconf, needed when enabling maemo support])
-   fi
 fi
 
 ####################################################################
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index e863868..2fccf5c 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -23,8 +23,7 @@ libtracker_sparql_la_SOURCES =   \
 	tracker-connection.vala                        \
 	tracker-cursor.vala                            \
 	tracker-utils.vala                             \
-	tracker-uri.c                                  \
-	tracker-init.c
+	tracker-uri.c
 
 libtracker_sparql_la_LIBADD =    \
 	$(BUILD_LIBS)                                  \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]