[grilo-plugins/debian: 46/49] tracker: bump glib dependencies to 2.26.0 only for tracker plugin



commit 0e5b62583fff9f3b0ad35b4e1e7cfafa425de3fd
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Thu Jan 27 18:34:34 2011 +0000

    tracker: bump glib dependencies to 2.26.0 only for tracker plugin
    
    This partially reverts commit 73fa43016fe5a38b7b1360f87870d41e452bd996.
    
    Instead of bumping glib dependency to 2.26.0 for all plugins, just do it for
    tracker plugin, as this is the one that actually needs this version.
    
    Signed-off-by: Juan A. Suarez Romero <jasuarez igalia com>

 configure.ac |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 240b1a5..8b6ae80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,9 +79,9 @@ fi
 # HARD DEPENDENCIES
 # ----------------------------------------------------------
 
-PKG_CHECK_MODULES([DEPS], glib-2.0 >= 2.26.0 \
-			  gobject-2.0 \
-			  gmodule-2.0 \
+PKG_CHECK_MODULES([DEPS], glib-2.0      \
+			  gobject-2.0   \
+			  gmodule-2.0   \
 			  ${GRL_NAME} = 0.1.7)
 
 # ----------------------------------------------------------
@@ -131,6 +131,10 @@ PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.10,
                                                                      HAVE_TRACKER_SPARQL=yes,
                                                                      HAVE_TRACKER_SPARQL=no)])
 
+PKG_CHECK_MODULES(GLIB_2_26, glib-2.0 >= 2.26.0,
+                             HAVE_GLIB_2_26=yes,
+                             HAVE_GLIB_2_26=no)
+
 # ----------------------------------------------------------
 # GDATA VERSION
 # ----------------------------------------------------------
@@ -665,11 +669,14 @@ AC_ARG_ENABLE(tracker,
                         if test "x$HAVE_TRACKER_SPARQL" = "xno"; then
                            AC_MSG_ERROR([tracker-sparql-0.9 not found, install it or use --disable-tracker])
                         fi
+                        if test "x$HAVE_GLIB_2_26" = "xno"; then
+                           AC_MSG_ERROR([glib-2.26.0 or above not found, install it or use --disable-tracker])
+                        fi
                         ;;
                 esac
         ],
         [
-                if test "x$HAVE_TRACKER_SPARQL" = "xyes"; then
+                if test "x$HAVE_TRACKER_SPARQL" = "xyes" -a "x$HAVE_GLIB_2_26" = "xyes"; then
                    enable_tracker=yes
                 else
                    enable_tracker=no



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