Updated Polish translation

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 208fcbff2d12db211a678d5164f6489b257602fe..40ce9922e9b3fc2cd2ac7bd261715a6a82616c83 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [2])
 m4_define([empathy_minor_version], [31])
-m4_define([empathy_micro_version], [90])
+m4_define([empathy_micro_version], [92])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -31,7 +31,7 @@ AC_COPYRIGHT([
 # Minimal version required
 
 # Hardp deps
-FOLKS_REQUIRED=0.1.13
+FOLKS_REQUIRED=0.1.15
 GCONF_REQUIRED=1.2.0
 GLIB_REQUIRED=2.25.9
 GNUTLS_REQUIRED=2.8.5
@@ -41,7 +41,7 @@ LIBCANBERRA_GTK_REQUIRED=0.4
 LIBNOTIFY_REQUIRED=0.4.4
 LIBNOTIFY_REQUIRED_GTK3=0.5.1
 TELEPATHY_FARSIGHT_REQUIRED=0.0.14
-TELEPATHY_GLIB_REQUIRED=0.11.13
+TELEPATHY_GLIB_REQUIRED=0.11.15
 TELEPATHY_LOGGER=0.1.5
 UNIQUE_REQUIRED=1.1.2
 
@@ -50,9 +50,9 @@ CLUTTER_GTK_REQUIRED=0.10
 ENCHANT_REQUIRED=1.2.0
 GEOCLUE_REQUIRED=0.11
 ISO_CODES_REQUIRED=0.35
-LIBCHAMPLAIN_GTK_REQUIRED=0.4
-LIBCHAMPLAIN_REQUIRED=0.4
-NAUTILUS_SENDTO_REQUIRED=2.28.1
+LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
+LIBCHAMPLAIN_REQUIRED=0.7.1
+NAUTILUS_SENDTO_REQUIRED=2.31.7
 NAUTILUS_SENDTO_REQUIRED_GTK3=2.90.0
 NETWORK_MANAGER_REQUIRED=0.7.0
 WEBKIT_REQUIRED=1.1.15
@@ -151,11 +151,11 @@ PKG_CHECK_MODULES(EMPATHY,
    folks >= $FOLKS_REQUIRED
    folks-telepathy >= $FOLKS_REQUIRED
    gconf-2.0 >= $GCONF_REQUIRED
-   gcr-0 >= $KEYRING_REQUIRED
    gio-2.0 >= $GLIB_REQUIRED
    gio-unix-2.0 >= $GLIB_REQUIRED
    gnome-keyring-1 >= $KEYRING_REQUIRED
    gnutls >= $GNUTLS_REQUIRED
+   gmodule-export-2.0
    gobject-2.0
    gstreamer-0.10
    gstreamer-interfaces-0.10
@@ -204,6 +204,9 @@ if test "x$have_gtk3" == "xyes"; then
    PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED)
    PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_GTK3)
    PKG_CHECK_MODULES(UNIQUE, unique-3.0 >= $UNIQUE_REQUIRED)
+   PKG_CHECK_MODULES(GCR, gcr-3 >= $KEYRING_REQUIRED)
+
+   AC_DEFINE(HAVE_GTK3, 1, [Define if we're compiling against GTK+ 3])
 else
    PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
 
@@ -211,6 +214,7 @@ else
    PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED)
    PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
    PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED)
+   PKG_CHECK_MODULES(GCR, gcr-0 >= $KEYRING_REQUIRED)
 
    # Enable GSEAL checks if needed
    if test $USE_MAINTAINER_MODE = yes; then
@@ -369,8 +373,8 @@ if test "x$enable_map" != "xno"; then
    if test "x$have_gtk3" == "xno"; then
       PKG_CHECK_MODULES(LIBCHAMPLAIN,
       [
-         champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED,
-         champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED
+         champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED,
+         champlain-gtk-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED
          clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
       ], have_libchamplain="yes", have_libchamplain="no")
    else
@@ -465,8 +469,6 @@ if test "x$enable_nautilus_sendto" != "xno"; then
          nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED
          nautilus-sendto < 2.90.0
       ], have_nst="yes", have_nst="no")
-
-      AC_DEFINE(HAVE_OLD_NST, [], [Legacy compat mode with old nautilus-sendto] )
    else
       PKG_CHECK_MODULES(NST,
       [