Updated Russian translation

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7abcf0f11859f52620574003d5f93d0095e96981..df11d7ed7c6fcb76f809ac115130d27f145817ef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@ m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [2])
 m4_define([empathy_minor_version], [91])
-m4_define([empathy_micro_version], [0])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_micro_version], [5])
+m4_define([empathy_nano_version], [1])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
@@ -31,20 +31,19 @@ AC_COPYRIGHT([
 # Minimal version required
 
 # Hardp deps
-FOLKS_REQUIRED=0.1.15
-GCONF_REQUIRED=1.2.0
-GLIB_REQUIRED=2.25.9
+FOLKS_REQUIRED=0.3.3
+GLIB_REQUIRED=2.27.2
 GNUTLS_REQUIRED=2.8.5
-GTK_REQUIRED=2.91.0
+GTK_REQUIRED=2.99.0
 KEYRING_REQUIRED=2.26.0
+GCR_REQUIRED=2.91.4
 LIBCANBERRA_GTK_REQUIRED=0.25
-LIBNOTIFY_REQUIRED=0.5.1
+LIBNOTIFY_REQUIRED=0.7.0
 TELEPATHY_FARSIGHT_REQUIRED=0.0.14
-TELEPATHY_GLIB_REQUIRED=0.11.16
+TELEPATHY_GLIB_REQUIRED=0.13.9
 TELEPATHY_LOGGER=0.1.5
-UNIQUE_REQUIRED=1.1.2
 
-# Optionnal deps
+# Optional deps
 CLUTTER_GTK_REQUIRED=0.90.3
 ENCHANT_REQUIRED=1.2.0
 GEOCLUE_REQUIRED=0.11
@@ -59,8 +58,9 @@ GNOME_CONTROL_CENTER_REQUIRED=2.31.4
 # Use --enable-maintainer-mode to disable deprecated symbols,
 # disable single include and enable GSEAL. If this is not a released empathy,
 # maintainer mode is forced
-ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
-GNOME_MAINTAINER_MODE_DEFINES
+# FIXME: don't disable deprecated symbols until bgo #636654 has been fixed
+#ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
+#GNOME_MAINTAINER_MODE_DEFINES
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -148,13 +148,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
@@ -162,6 +162,10 @@ PKG_CHECK_MODULES(EMPATHY,
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    telepathy-logger-0.1 >= $TELEPATHY_LOGGER
    x11
+   gtk+-3.0 >= $GTK_REQUIRED
+   libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED
+   libnotify >= $LIBNOTIFY_REQUIRED
+   gcr-3 >= $GCR_REQUIRED
 ])
 
 # -----------------------------------------------------------
@@ -175,16 +179,6 @@ if test x"$with_eds" = x"yes" ; then
    AC_DEFINE(HAVE_EDS, 1, [Define if we have libebook])
 fi
 
-# -----------------------------------------------------------
-# GTK+
-# -----------------------------------------------------------
-PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
-
-PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED)
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
-PKG_CHECK_MODULES(UNIQUE, unique-3.0 >= $UNIQUE_REQUIRED)
-PKG_CHECK_MODULES(GCR, gcr-3 >= $KEYRING_REQUIRED)
-
 # -----------------------------------------------------------
 # Enable debug
 # -----------------------------------------------------------
@@ -381,7 +375,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)
 
@@ -389,6 +383,7 @@ if test "x$enable_meego" != "xno"; then
     PKG_CHECK_MODULES(MEEGO,
     [
        mx-gtk-1.0
+       gio-unix-2.0
     ], have_meego="yes", have_meego="no")
 
     if test "x$have_meego" = "xyes"; then