Updated Galician translations

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5d09d86f0d872f799b1c1a95fa2092ca71e3984d..5ffe0de3f31ed7f99f72f67bf6f5b9c6dbaed71f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl If not 1, append datestamp to the version number
 m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [2])
-m4_define([empathy_minor_version], [29])
-m4_define([empathy_micro_version], [91])
+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])
@@ -442,6 +443,7 @@ if test "x$enable_meego" != "xno"; then
 
     if test "x$have_meego" = "xyes"; then
        AC_DEFINE(HAVE_MEEGO, 1, [Define if you have meego])
+       chain_enable_favourite_contacts="yes"
     fi
 else
    have_meego="no"
@@ -455,6 +457,34 @@ AM_CONDITIONAL(HAVE_MEEGO, test "x$have_meego" = "xyes")
 AC_SUBST(MEEGO_CFLAGS)
 AC_SUBST(MEEGO_LIBS)
 
+# -----------------------------------------------------------
+# favourite contacts support
+# -----------------------------------------------------------
+AC_ARG_ENABLE(favourite_contacts,
+              AS_HELP_STRING([--enable-favourite-contacts=@<:no/yes@:>@],
+                             [Enable favourite contacts]), ,
+                             enable_favourite_contacts=no)
+
+if test "x$enable_favourite_contacts" != "xno" || test "x$chain_enable_favourite_contacts" = "xyes"; then
+    PKG_CHECK_MODULES(TELEPATHY_LOGGER,
+    [
+       telepathy-logger
+    ], have_telepathy_logger="yes", have_telepathy_logger="no")
+
+    if test "x$have_telepathy_logger" = "xyes"; then
+       have_favourite_contacts="yes"
+       AC_DEFINE(HAVE_FAVOURITE_CONTACTS, 1, [Define if you want favourite contacts support])
+    fi
+else
+   have_favourite_contacts="no"
+fi
+
+if test "x$enable_favourite_contacts" = "xyes" && test "x$have_favourite_contacts" != "xyes"; then
+   AC_MSG_ERROR([Couldn't find favourite contacts dependencies.])
+fi
+
+AM_CONDITIONAL(HAVE_FAVOURITE_CONTACTS, test "x$have_telepathy_logger" = "xyes")
+
 # -----------------------------------------------------------
 # nautilus-sendto
 # -----------------------------------------------------------
@@ -551,6 +581,7 @@ Configure summary:
        Location awareness (Geoclue):  ${have_geoclue}
        Adium themes (Webkit).......:  ${have_webkit}
        Meego widgets ..............:  ${have_meego}
+       Favourite contacts .........:  ${have_favourite_contacts}
        Control center embedding....:  ${have_control_center_embedding}
 
     Logging: