Updated POTFILES.in

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3a0c72ddf18e1a9b96ed19dd7cd67838d5e291a7..6e5caeceb1f534c1a399b182155a4c3c6a8d7e86 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,12 @@ GTK_REQUIRED=3.0.2
 AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_0, [Ignore post 3.0 deprecations])
 AC_DEFINE(GDK_VERSION_MAX_REQUIRED, GDK_VERSION_3_0, [Prevent post 3.0 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
+
 GSTREAMER_REQUIRED=0.10.32
 KEYRING_REQUIRED=2.26.0
 GCR_REQUIRED=2.91.4
@@ -57,8 +63,6 @@ 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
 ISO_CODES_REQUIRED=0.35
@@ -73,9 +77,6 @@ CHAMPLAIN_REQUIRED=0.12.1
 #ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 #GNOME_MAINTAINER_MODE_DEFINES
 
-# 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])
@@ -293,9 +294,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])
@@ -432,8 +430,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