Merge remote-tracking branch 'origin/call1' into master+call

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9392378006f548ffabb797b21e4c106258d509ce..68e50444b612d4b496b9980506a2e485f76b1133 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [3])
-m4_define([empathy_micro_version], [4])
+m4_define([empathy_micro_version], [5])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -44,7 +44,7 @@ GCR_REQUIRED=2.91.4
 LIBCANBERRA_GTK_REQUIRED=0.25
 LIBNOTIFY_REQUIRED=0.7.0
 TELEPATHY_FARSIGHT_REQUIRED=0.0.18
-TELEPATHY_GLIB_REQUIRED=0.17.3
+TELEPATHY_GLIB_REQUIRED=0.17.5
 TELEPATHY_LOGGER=0.2.10
 WEBKIT_REQUIRED=1.3.13
 GOA_REQUIRED=3.3.0
@@ -71,6 +71,9 @@ CHAMPLAIN_REQUIRED=0.12.1
 # 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])
@@ -94,7 +97,6 @@ AC_PATH_XTRA
 LT_PREREQ([2.2])
 LT_INIT
 
-GNOME_DOC_INIT([0.17.3])
 AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
 GLIB_GSETTINGS
 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
@@ -632,6 +634,8 @@ else
 fi
 AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
 
+# Help documentation
+YELP_HELP_INIT
 
 # -----------------------------------------------------------
 # Coding style checks