Updated Belarusian translation.

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 71b6fd6bda5c1950e5abfd59665a60a035f982b4..8346bbd5e4930f32c34e6707669d0ddd25529f43 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl If not 1, append datestamp to the version number
-m4_define(empathy_released, 0)
+m4_define(empathy_released, 1)
 
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [3])
-m4_define([empathy_micro_version], [90])
-m4_define([empathy_nano_version], [2])
+m4_define([empathy_micro_version], [92])
+m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
@@ -35,9 +35,23 @@ AC_COPYRIGHT([
 
 # Hardp deps
 FOLKS_REQUIRED=0.6.6
-GLIB_REQUIRED=2.30.0
 GNUTLS_REQUIRED=2.8.5
-GTK_REQUIRED=3.0.2
+
+GLIB_REQUIRED=2.30.0
+AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations])
+AC_DEFINE(GLIB_VERSION_MAX_REQUIRED, GLIB_VERSION_2_30, [Prevent post 2.30 APIs])
+
+GTK_REQUIRED=3.3.6
+AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_4, [Ignore post 3.4 deprecations])
+AC_DEFINE(GDK_VERSION_MAX_REQUIRED, GDK_VERSION_3_4, [Prevent post 3.4 APIs])
+
+CLUTTER_REQUIRED=1.8.0
+AC_DEFINE(CLUTTER_VERSION_MIN_REQUIRED, CLUTTER_VERSION_1_8, [Ignore post 1.8 deprecations])
+AC_DEFINE(CLUTTER_VERSION_MAX, CLUTTER_VERSION_1_8, [Prevent post 1.8 APIs])
+
+CLUTTER_GTK_REQUIRED=0.90.3
+CLUTTER_GST_REQUIRED=1.5.2
+
 GSTREAMER_REQUIRED=0.10.32
 KEYRING_REQUIRED=2.26.0
 GCR_REQUIRED=2.91.4
@@ -50,10 +64,8 @@ WEBKIT_REQUIRED=1.3.13
 GOA_REQUIRED=3.3.0
 
 # Optional deps
-CLUTTER_REQUIRED=1.7.14
-CLUTTER_GTK_REQUIRED=0.90.3
 ENCHANT_REQUIRED=1.2.0
-GEOCLUE_REQUIRED=0.11
+GEOCLUE_REQUIRED=0.12
 ISO_CODES_REQUIRED=0.35
 NAUTILUS_SENDTO_REQUIRED=2.90.0
 NETWORK_MANAGER_REQUIRED=0.7.0
@@ -66,14 +78,6 @@ CHAMPLAIN_REQUIRED=0.12.1
 #ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 #GNOME_MAINTAINER_MODE_DEFINES
 
-# Disable GLib deprecation warnings for now; we don't want to bump the GLib dep
-# and make things harder for contributiors without good reason. We'll re-enable
-# those warnings later during the cycle (bgo #662662)
-AC_DEFINE(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, [Build with GLib deprecated])
-
-# FIXME: bgo #669673
-AC_DEFINE(CLUTTER_DISABLE_DEPRECATION_WARNINGS, 1, [Build with Clutter deprecated])
-
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
@@ -202,8 +206,8 @@ PKG_CHECK_MODULES(EMPATHY_CALL,
    farstream-0.1
    telepathy-farstream >= $TELEPATHY_FARSTREAM_REQUIRED
    clutter-1.0 >= $CLUTTER_REQUIRED
-   clutter-gtk-1.0
-   clutter-gst-1.0
+   clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
+   clutter-gst-1.0 >= $CLUTTER_GST_REQUIRED
 ])
 
 AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
@@ -291,9 +295,6 @@ fi
 # -----------------------------------------------------------
 IT_PROG_INTLTOOL([0.40.0])
 
-AM_GNU_GETTEXT_VERSION([0.17])
-AM_GNU_GETTEXT([external])
-
 GETTEXT_PACKAGE=empathy
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
@@ -430,8 +431,8 @@ if test "x$enable_map" != "xno"; then
    PKG_CHECK_MODULES(LIBCHAMPLAIN,
     [
        clutter-gtk-1.0
-       champlain-gtk-0.14
-       champlain-0.14 >= $CHAMPLAIN_REQUIRED
+       champlain-gtk-0.12
+       champlain-0.12 >= $CHAMPLAIN_REQUIRED
     ], have_libchamplain="yes", have_libchamplain="no")
 
    if test "x$have_libchamplain" = "xyes"; then