Updated Galician translations

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f1cc1cb0ca0e5d144b165a514dda89a3d30b72aa..5ffe0de3f31ed7f99f72f67bf6f5b9c6dbaed71f 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], [30])
-m4_define([empathy_micro_version], [0])
+m4_define([empathy_minor_version], [31])
+m4_define([empathy_micro_version], [3])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -30,9 +30,9 @@ AC_COPYRIGHT([
 
 # Minimal version required
 GLIB_REQUIRED=2.22.0
-GTK_REQUIRED=2.18.0
+GTK_REQUIRED=2.20.0
 GCONF_REQUIRED=1.2.0
-TELEPATHY_GLIB_REQUIRED=0.9.2
+TELEPATHY_GLIB_REQUIRED=0.11.6
 TELEPATHY_LOGGER=0.1.1
 ENCHANT_REQUIRED=1.2.0
 ISO_CODES_REQUIRED=0.35
@@ -47,13 +47,14 @@ KEYRING_REQUIRED=2.22
 NETWORK_MANAGER_REQUIRED=0.7.0
 NAUTILUS_SENDTO_REQUIRED=2.28.1
 
-# Use --enable-maintainer-mode to disabled deprecated symbols
+# Use --enable-maintainer-mode to disable deprecated symbols,
+# disable single include and enable GSEAL. If this is not a released empathy,
+# maintainer mode is forced
+ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 GNOME_MAINTAINER_MODE_DEFINES
-
-# Warning if GLib/GDK/GTK headers are included
-AC_DEFINE(G_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GLib])
-AC_DEFINE(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GDK pixbuf])
-AC_DEFINE(GTK_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GTK])
+#if test $USE_MAINTAINER_MODE = yes; then
+#  AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors])
+#fi
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -464,7 +465,7 @@ AC_ARG_ENABLE(favourite_contacts,
                              [Enable favourite contacts]), ,
                              enable_favourite_contacts=no)
 
-if test "x$enable_favourite_contacts" != "xno" -o "x$chain_enable_favourite_contacts" == "xyes"; then
+if test "x$enable_favourite_contacts" != "xno" || test "x$chain_enable_favourite_contacts" = "xyes"; then
     PKG_CHECK_MODULES(TELEPATHY_LOGGER,
     [
        telepathy-logger
@@ -478,7 +479,7 @@ else
    have_favourite_contacts="no"
 fi
 
-if test "x$enable_favourite_contacts" = "xyes" -a "x$have_favourite_contacts" != "xyes"; then
+if test "x$enable_favourite_contacts" = "xyes" && test "x$have_favourite_contacts" != "xyes"; then
    AC_MSG_ERROR([Couldn't find favourite contacts dependencies.])
 fi