[l10n]Updated Catalan (Valencian) translation

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 70ca49214b7f8038ed30e51087b4b0df6a46dbc0..33bbf466aa5b77073c5d0088419a1f70cf29648d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,9 @@ dnl If not 1, append datestamp to the version number
 m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [3])
-m4_define([empathy_minor_version], [3])
-m4_define([empathy_micro_version], [91])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_minor_version], [4])
+m4_define([empathy_micro_version], [0])
+m4_define([empathy_nano_version], [2])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
@@ -39,17 +39,18 @@ GNUTLS_REQUIRED=2.8.5
 
 GLIB_REQUIRED=2.30.0
 AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations])
-AC_DEFINE(GLIB_VERSION_MAX_REQUIRED, GLIB_VERSION_2_30, [Prevent post 2.30 APIs])
+AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_30, [Prevent post 2.30 APIs])
 
-GTK_REQUIRED=3.0.2
-AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_0, [Ignore post 3.0 deprecations])
-AC_DEFINE(GDK_VERSION_MAX_REQUIRED, GDK_VERSION_3_0, [Prevent post 3.0 APIs])
+GTK_REQUIRED=3.3.6
+AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_4, [Ignore post 3.4 deprecations])
+AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_4, [Prevent post 3.4 APIs])
 
-CLUTTER_REQUIRED=1.7.14
-AC_DEFINE(CLUTTER_VERSION_MIN_REQUIRED, CLUTTER_VERSION_1_6, [Ignore post 1.6 deprecations])
-AC_DEFINE(CLUTTER_VERSION_MAX, CLUTTER_VERSION_1_6, [Prevent post 1.6 APIs])
+CLUTTER_REQUIRED=1.10.0
+AC_DEFINE(CLUTTER_VERSION_MIN_REQUIRED, CLUTTER_VERSION_1_8, [Ignore post 1.8 deprecations])
+AC_DEFINE(CLUTTER_VERSION_MAX_ALLOWED, CLUTTER_VERSION_1_10, [Prevent post 1.10 APIs])
 
 CLUTTER_GTK_REQUIRED=0.90.3
+CLUTTER_GST_REQUIRED=1.5.2
 
 GSTREAMER_REQUIRED=0.10.32
 KEYRING_REQUIRED=2.26.0
@@ -58,13 +59,13 @@ LIBCANBERRA_GTK_REQUIRED=0.25
 LIBNOTIFY_REQUIRED=0.7.0
 TELEPATHY_FARSTREAM_REQUIRED=0.2.1
 TELEPATHY_GLIB_REQUIRED=0.17.5
-TELEPATHY_LOGGER=0.2.10
+TELEPATHY_LOGGER=0.2.13
 WEBKIT_REQUIRED=1.3.13
 GOA_REQUIRED=3.3.0
 
 # Optional deps
 ENCHANT_REQUIRED=1.2.0
-GEOCLUE_REQUIRED=0.11
+GEOCLUE_REQUIRED=0.12
 ISO_CODES_REQUIRED=0.35
 NAUTILUS_SENDTO_REQUIRED=2.90.0
 NETWORK_MANAGER_REQUIRED=0.7.0
@@ -205,8 +206,8 @@ PKG_CHECK_MODULES(EMPATHY_CALL,
    farstream-0.1
    telepathy-farstream >= $TELEPATHY_FARSTREAM_REQUIRED
    clutter-1.0 >= $CLUTTER_REQUIRED
-   clutter-gtk-1.0
-   clutter-gst-1.0
+   clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
+   clutter-gst-1.0 >= $CLUTTER_GST_REQUIRED
 ])
 
 AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
@@ -230,40 +231,6 @@ if test "x$enable_empathy_av" != "xno" ; then
 fi
 AM_CONDITIONAL(HAVE_EMPATHY_AV, test "x$have_empathy_av" = "xyes")
 
-# -----------------------------------------------------------
-# Call support in tp-logger
-# -----------------------------------------------------------
-AC_ARG_ENABLE(call-logs,
-            AS_HELP_STRING([--enable-call-logs=@<:@no/yes/auto@:>@],
-            [build with call logs support]),,
-            [enable_call_logs=auto])
-if test "x$enable_call_logs" != "xno" ; then
-   SAVE_CFLAGS=$CFLAGS
-   SAVE_CPPFLAGS=$CPPFLAGS
-   SAVE_LDFLAGS=$LDFLAGS
-   CFLAGS="$CFLAGS $EMPATHY_CFLAGS"
-   CPPFLAGS="$CPPFLAGS $EMPATHY_CFLAGS"
-   LDFLAGS="$LDFLAGS $EMPATHY_LDFLAGS"
-
-   AC_CHECK_HEADER(telepathy-logger/call-event.h,
-      have_call_logs="yes", have_call_logs="no")
-
-   CFLAGS=$SAVE_CFLAGS
-   CPPFLAGS=$SAVE_CPPFLAGS
-   LDFLAGS=$SAVE_LDFLAGS
-
-   if test "x$have_call_logs" = "xyes"; then
-      AC_DEFINE(HAVE_CALL_LOGS, 1, [Define if you have call log support])
-   fi
-else
-  have_call_logs=no
-fi
-
-if test "x$enable_call_logs" = "xyes" -a "x$have_call_logs" != "xyes"; then
-   AC_MSG_ERROR([Call logs support requested but telepathy-logger wasn't
-                 built with --enable-call])
-fi
-
 # -----------------------------------------------------------
 # evolution-data-server (about-me)
 # -----------------------------------------------------------
@@ -685,6 +652,5 @@ Configure summary:
        Nautilus-sendto plugin......:  ${have_nst}
        GOA MC plugin...............:  ${have_goa}
        Salut E-D-S support.........:  ${with_eds}
-       Exp. Call log support.......:  ${have_call_logs}
        empathy-av (legacy).........:  ${enable_empathy_av}
 "