Updated Polish translation

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 48dd5ea48fdd999f2ad3a7e73724f2217ece722d..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'
@@ -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
 
@@ -151,7 +151,6 @@ 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
@@ -205,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)
 
@@ -212,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