Updated Polish translation

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2ace54bff41f0214c79a505a5a4f281029436720..40ce9922e9b3fc2cd2ac7bd261715a6a82616c83 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl If not 1, append datestamp to the version number
-m4_define(empathy_released, 1)
+m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [2])
 m4_define([empathy_minor_version], [31])
-m4_define([empathy_micro_version], [91])
+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
 
@@ -204,10 +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)
-   # gcr-1 doesn't exist at the moment, and could even be named differently
-   # once it exists, but checking for it makes sure configure abort, instead
-   # of allowing to build an empathy binary linked to both GTK+ 2 and 3.
-   PKG_CHECK_MODULES(GCR, gcr-1 >= $KEYRING_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)