maithili update

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7576c8e9dace19ea68fbcec2eda0abf0429a4ddb..710d55d03cd22adecc804f8017771669f594a059 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Empathy, 2.27.90, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT(Empathy, 2.28.0, http://bugzilla.gnome.org/browse.cgi?product=empathy)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB
@@ -9,12 +9,12 @@ AC_COPYRIGHT([
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
 #   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
 #   (No interfaces changed:                   REVISION++)
-LIBEMPATHY_CURRENT=28
-LIBEMPATHY_AGE=1
+LIBEMPATHY_CURRENT=30
+LIBEMPATHY_AGE=0
 LIBEMPATHY_REVISION=0
 
-LIBEMPATHY_GTK_CURRENT=26
-LIBEMPATHY_GTK_AGE=1
+LIBEMPATHY_GTK_CURRENT=28
+LIBEMPATHY_GTK_AGE=0
 LIBEMPATHY_GTK_REVISION=0
 
 AC_SUBST(LIBEMPATHY_CURRENT)
@@ -29,16 +29,17 @@ GLIB_REQUIRED=2.16.0
 GTK_REQUIRED=2.16.0
 GCONF_REQUIRED=1.2.0
 LIBPANELAPPLET_REQUIRED=2.10.0
-TELEPATHY_GLIB_REQUIRED=0.7.34
+TELEPATHY_GLIB_REQUIRED=0.7.35
 ENCHANT_REQUIRED=1.2.0
 ISO_CODES_REQUIRED=0.35
 LIBNOTIFY_REQUIRED=0.4.4
 LIBCANBERRA_GTK_REQUIRED=0.4
-LIBCHAMPLAIN_REQUIRED=0.3.6
-LIBCHAMPLAIN_GTK_REQUIRED=0.3.6
+LIBCHAMPLAIN_REQUIRED=0.4
+LIBCHAMPLAIN_GTK_REQUIRED=0.4
 CLUTTER_GTK_REQUIRED=0.10
 GEOCLUE_REQUIRED=0.11
 WEBKIT_REQUIRED=1.1.7
+KEYRING_REQUIRED=2.22
 NETWORK_MANAGER_REQUIRED=0.7.0
 
 # Use --enable-maintainer-mode to disabled deprecated symbols
@@ -66,7 +67,7 @@ AM_PATH_GLIB_2_0
 AC_PATH_XTRA
 IT_PROG_INTLTOOL([0.35.0])
 GTK_DOC_CHECK([1.3])
-GNOME_DOC_INIT
+GNOME_DOC_INIT([0.17.3])
 IDT_COMPILE_WARNINGS
 AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
@@ -127,6 +128,7 @@ PKG_CHECK_MODULES(EMPATHY,
    telepathy-farsight
    gstreamer-0.10
    unique-1.0
+   gnome-keyring-1 >= $KEYRING_REQUIRED
 ])
 
 PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
@@ -276,8 +278,8 @@ AC_ARG_ENABLE(map,
 if test "x$enable_map" != "xno"; then
    PKG_CHECK_MODULES(LIBCHAMPLAIN,
    [
-      champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
-      champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
+      champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED,
+      champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED
       clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    ], have_libchamplain="yes", have_libchamplain="no")