Merge branch 'gnome-3-6'

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 45acac27a13ebacc546a882e79551136a607dd83..141a813f14dea4f41a0194b9e86a27f410aea48c 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], [3])
-m4_define([empathy_minor_version], [5])
-m4_define([empathy_micro_version], [91])
+m4_define([empathy_minor_version], [7])
+m4_define([empathy_micro_version], [3])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -34,7 +34,7 @@ AC_COPYRIGHT([
 # Minimal version required
 
 # Hardp deps
-FOLKS_REQUIRED=0.7.1
+FOLKS_REQUIRED=0.7.3
 GNUTLS_REQUIRED=2.8.5
 
 GLIB_REQUIRED=2.33.3
@@ -51,23 +51,26 @@ AC_DEFINE(CLUTTER_VERSION_MAX_ALLOWED, CLUTTER_VERSION_1_10, [Prevent post 1.10
 
 CLUTTER_GTK_REQUIRED=1.1.2
 
-TELEPATHY_GLIB_REQUIRED=0.19.6
+TELEPATHY_GLIB_REQUIRED=0.19.9
 AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_20, [Ignore post 0.20 deprecations])
 AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_20, [Prevent post 0.20 APIs])
 AC_DEFINE(TP_SEAL_ENABLE, 1, [Prevent to use sealed variables])
+AC_DEFINE(TP_DISABLE_SINGLE_INCLUDE, 1, [Disable single include header])
 
 GSTREAMER_REQUIRED=0.10.32
+TP_FS_REQUIRED=0.6.0
 LIBSECRET_REQUIRED=0.5
 GCR_REQUIRED=2.91.4
 LIBCANBERRA_GTK_REQUIRED=0.25
 LIBNOTIFY_REQUIRED=0.7.0
-TELEPATHY_LOGGER=0.2.13
-WEBKIT_REQUIRED=1.3.13
+TELEPATHY_LOGGER=0.6.0
+WEBKIT_REQUIRED=1.9.1
 GOA_REQUIRED=3.5.1
 
 # Optional deps
 ENCHANT_REQUIRED=1.2.0
 GEOCLUE_REQUIRED=0.12
+GEOCODE_GLIB_REQUIRED=0.99.1
 ISO_CODES_REQUIRED=0.35
 NAUTILUS_SENDTO_REQUIRED=2.90.0
 NETWORK_MANAGER_REQUIRED=0.7.0
@@ -75,7 +78,7 @@ CHAMPLAIN_REQUIRED=0.12.1
 CHEESE_GTK_REQUIRED=3.4.0
 LIBACCOUNTS_REQUIRED=1.1
 LIBSIGNON_REQUIRED=1.1
-MC_PLUGINS_REQUIRED=5.13.0
+MC_PLUGINS_REQUIRED=5.13.1
 
 # Use --enable-maintainer-mode to disable deprecated symbols,
 # disable single include and enable GSEAL. If this is not a released empathy,
@@ -225,16 +228,19 @@ AC_ARG_ENABLE(gst-1.0,
                              enable_gst1=$enableval,
                              enable_gst1=auto)
 
-# Try to use GStreamer 1.à if available
+# Try to use GStreamer 1.0 if available
 have_gst1="no"
 if test "x$enable_gst1" != "xno"; then
   PKG_CHECK_MODULES(EMPATHY_CALL,
   [
      farstream-0.2
-     telepathy-farstream >= 0.4.999
+     telepathy-farstream >= $TP_FS_REQUIRED
      clutter-1.0 >= $CLUTTER_REQUIRED
      clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
      clutter-gst-2.0
+     gstreamer-1.0
+     gstreamer-audio-1.0
+     gstreamer-video-1.0
   ], have_gst1="yes", have_gst1="no")
 
   if test "x$have_gst1" = "xyes"; then
@@ -252,7 +258,7 @@ if test "x$have_gst1" != "xyes"; then
   PKG_CHECK_MODULES(EMPATHY_CALL,
   [
      farstream-0.1
-     telepathy-farstream >= 0.2.1
+     telepathy-farstream >= $TP_FS_REQUIRED
      clutter-1.0 >= $CLUTTER_REQUIRED
      clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
      clutter-gst-1.0 >= 1.5.2
@@ -431,7 +437,7 @@ AC_ARG_ENABLE(geocode,
 if test "x$enable_geocode" != "xno"; then
    PKG_CHECK_MODULES(GEOCODE,
    [
-      geocode-glib
+      geocode-glib >= $GEOCODE_GLIB_REQUIRED
    ], have_geocode="yes", have_geocode="no")
 
    if test "x$have_geocode" = "xyes"; then
@@ -635,6 +641,7 @@ AC_CONFIG_FILES([
    ubuntu-online-accounts/Makefile
    ubuntu-online-accounts/mc-plugin/Makefile
    ubuntu-online-accounts/cc-plugins/Makefile
+   ubuntu-online-accounts/cc-plugins/account-plugins/Makefile
    ubuntu-online-accounts/cc-plugins/providers/Makefile
    ubuntu-online-accounts/cc-plugins/services/Makefile
    ubuntu-online-accounts/cc-plugins/app-plugin/Makefile