Merge branch 'sasl'

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d2f09df1b139a7ccc51816662436ce4721b5f5fd..4ed8d9e24e755caff1105c99574dfafddebbd700 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [2])
 m4_define([empathy_minor_version], [91])
-m4_define([empathy_micro_version], [2])
+m4_define([empathy_micro_version], [3])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -32,7 +32,6 @@ AC_COPYRIGHT([
 
 # Hardp deps
 FOLKS_REQUIRED=0.3.2
-GCONF_REQUIRED=1.2.0
 GLIB_REQUIRED=2.27.2
 GNUTLS_REQUIRED=2.8.5
 GTK_REQUIRED=2.91.3
@@ -40,10 +39,10 @@ KEYRING_REQUIRED=2.26.0
 LIBCANBERRA_GTK_REQUIRED=0.25
 LIBNOTIFY_REQUIRED=0.7.0
 TELEPATHY_FARSIGHT_REQUIRED=0.0.14
-TELEPATHY_GLIB_REQUIRED=0.13.1.1
+TELEPATHY_GLIB_REQUIRED=0.13.7
 TELEPATHY_LOGGER=0.1.5
 
-# Optionnal deps
+# Optional deps
 CLUTTER_GTK_REQUIRED=0.90.3
 ENCHANT_REQUIRED=1.2.0
 GEOCLUE_REQUIRED=0.11
@@ -147,13 +146,13 @@ PKG_CHECK_MODULES(EMPATHY,
    farsight2-0.10
    folks >= $FOLKS_REQUIRED
    folks-telepathy >= $FOLKS_REQUIRED
-   gconf-2.0 >= $GCONF_REQUIRED
    gio-2.0 >= $GLIB_REQUIRED
    gio-unix-2.0 >= $GLIB_REQUIRED
    gnome-keyring-1 >= $KEYRING_REQUIRED
    gnutls >= $GNUTLS_REQUIRED
    gmodule-export-2.0
    gobject-2.0
+   gsettings-desktop-schemas
    gstreamer-0.10
    gstreamer-interfaces-0.10
    libxml-2.0
@@ -406,7 +405,7 @@ AC_SUBST(GEOCLUE_LIBS)
 # meego widgets support
 # -----------------------------------------------------------
 AC_ARG_ENABLE(meego,
-              AS_HELP_STRING([--enable-meego=@<:no/yes@:>@],
+              AS_HELP_STRING([--enable-meego=@<:@no/yes@:>@],
                              [Enable meego widgets]), ,
                              enable_meego=no)