Updated Basque language

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 00c6b4da58d697d81a89edfa8482cef7565b673e..8bad2e2c6e0a0c8176cda0e8aaa4779b78620abb 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.27.92, 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=29
+LIBEMPATHY_AGE=0
 LIBEMPATHY_REVISION=0
 
-LIBEMPATHY_GTK_CURRENT=26
-LIBEMPATHY_GTK_AGE=1
+LIBEMPATHY_GTK_CURRENT=27
+LIBEMPATHY_GTK_AGE=0
 LIBEMPATHY_GTK_REVISION=0
 
 AC_SUBST(LIBEMPATHY_CURRENT)
@@ -30,7 +30,6 @@ GTK_REQUIRED=2.16.0
 GCONF_REQUIRED=1.2.0
 LIBPANELAPPLET_REQUIRED=2.10.0
 TELEPATHY_GLIB_REQUIRED=0.7.34
-MISSION_CONTROL_REQUIRED=4.61
 ENCHANT_REQUIRED=1.2.0
 ISO_CODES_REQUIRED=0.35
 LIBNOTIFY_REQUIRED=0.4.4
@@ -40,6 +39,7 @@ LIBCHAMPLAIN_GTK_REQUIRED=0.3.6
 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
@@ -67,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)
@@ -95,7 +95,6 @@ PKG_CHECK_MODULES(LIBEMPATHY,
    gio-unix-2.0 >= $GLIB_REQUIRED
    libxml-2.0
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-   libmissioncontrol >= $MISSION_CONTROL_REQUIRED
    telepathy-farsight
    farsight2-0.10
    gstreamer-0.10
@@ -111,7 +110,6 @@ PKG_CHECK_MODULES(LIBEMPATHYGTK,
    gtk+-2.0 >= $GTK_REQUIRED
    libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-   libmissioncontrol >= $MISSION_CONTROL_REQUIRED
    farsight2-0.10
    gstreamer-0.10
    gstreamer-interfaces-0.10
@@ -127,9 +125,10 @@ PKG_CHECK_MODULES(EMPATHY,
    libebook-1.2
    dbus-glib-1
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-   libmissioncontrol >= $MISSION_CONTROL_REQUIRED
    telepathy-farsight
    gstreamer-0.10
+   unique-1.0
+   gnome-keyring-1 >= $KEYRING_REQUIRED
 ])
 
 PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
@@ -164,38 +163,33 @@ AC_ARG_WITH(connectivity,
                              [build with connectivity support]), ,
                              with_connectivity=auto)
 
-PKG_CHECK_MODULES(NETWORK_MANAGER,
-[
-   libnm_glib >= $NETWORK_MANAGER_REQUIRED
-], have_nm="yes", have_nm="no")
-
-PKG_CHECK_MODULES(CONNMAN,
-[
-   dbus-glib-1
-], have_connman="yes", have_connman="no")
-
 if test "x$with_connectivity" = "xno"; then
    have_nm=no
    have_connman=no
 
-elif test "x$with_connectivity" = "xnm"; then
-   if test "x$have_nm" = "xyes"; then
-      AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib])
-      have_connman=no
-   fi
-
 elif test "x$with_connectivity" = "xconnman"; then
+
+   PKG_CHECK_MODULES(CONNMAN,
+   [
+      dbus-glib-1
+   ], have_connman="yes", have_connman="no")
+
    if test "x$have_connman" = "xyes"; then
       AC_DEFINE(HAVE_CONNMAN, 1, [Define if you have connman dependencies])
       have_nm=no
    fi
 
 else
+
+   PKG_CHECK_MODULES(NETWORK_MANAGER,
+   [
+      libnm_glib >= $NETWORK_MANAGER_REQUIRED
+   ], have_nm="yes", have_nm="no")
+
    if test "x$have_nm" = "xyes"; then
       AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib])
       have_connman=no
    fi
-
 fi
 
 if test "x$with_connectivity" = "xconnman" -a "x$have_connman" != "xyes"; then
@@ -346,7 +340,7 @@ if test "x$enable_megaphone" != "xno"; then
       glib-2.0 >= $GLIB_REQUIRED
       gtk+-2.0 >= $GTK_REQUIRED
       gconf-2.0 >= $GCONF_REQUIRED
-      libmissioncontrol >= $MISSION_CONTROL_REQUIRED
+      telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    ], have_megaphone="yes", have_megaphone="no")
 else
    have_megaphone=no
@@ -373,7 +367,7 @@ if test "x$enable_nothere" != "xno"; then
       glib-2.0 >= $GLIB_REQUIRED
       gtk+-2.0 >= $GTK_REQUIRED
       gconf-2.0 >= $GCONF_REQUIRED
-      libmissioncontrol >= $MISSION_CONTROL_REQUIRED
+      telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    ], have_nothere="yes", have_nothere="no")
 else
    have_nothere=no
@@ -424,7 +418,6 @@ if test "x$enable_python" != "xno"; then
       gobject-2.0
       gconf-2.0 >= $GCONF_REQUIRED
       libxml-2.0
-      libmissioncontrol >= $MISSION_CONTROL_REQUIRED
       gtk+-2.0 >= $GTK_REQUIRED
       gstreamer-0.10
       gstreamer-interfaces-0.10