X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=c22b3436fd9eb5e9349be103348b34c833a383c1;hp=88d47e348a69ec9af6a2ae38acc2b538c49c3559;hb=846cf36946ff8c36cf75678d9ed6552c33326228;hpb=cb5dc5dd166abb39fce526cea5b97b6d218b1fc7

diff --git a/configure.ac b/configure.ac
index 88d47e34..c22b3436 100644
--- 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], [6])
+m4_define([empathy_minor_version], [10])
 m4_define([empathy_micro_version], [0])
-m4_define([empathy_nano_version], [2])
+m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
@@ -34,16 +34,16 @@ AC_COPYRIGHT([
 # Minimal version required
 
 # Hardp deps
-FOLKS_REQUIRED=0.7.3
+FOLKS_REQUIRED=0.9.5
 GNUTLS_REQUIRED=2.8.5
 
-GLIB_REQUIRED=2.33.3
+GLIB_REQUIRED=2.37.6
 AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations])
-AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_34, [Prevent post 2.34 APIs])
+AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_38, [Prevent post 2.38 APIs])
 
-GTK_REQUIRED=3.5.1
-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])
+GTK_REQUIRED=3.9.4
+AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_8, [Ignore post 3.8 deprecations])
+AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_10, [Prevent post 3.10 APIs])
 
 CLUTTER_REQUIRED=1.10.0
 AC_DEFINE(CLUTTER_VERSION_MIN_REQUIRED, CLUTTER_VERSION_1_8, [Ignore post 1.8 deprecations])
@@ -55,26 +55,29 @@ 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.8.0
+WEBKIT_REQUIRED=1.9.1
 GOA_REQUIRED=3.5.1
 
 # Optional deps
 ENCHANT_REQUIRED=1.2.0
-GEOCLUE_REQUIRED=0.12
+GEOCLUE_REQUIRED=1.99.3
+GEOCODE_GLIB_REQUIRED=0.99.1
 ISO_CODES_REQUIRED=0.35
 NAUTILUS_SENDTO_REQUIRED=2.90.0
 NETWORK_MANAGER_REQUIRED=0.7.0
 CHAMPLAIN_REQUIRED=0.12.1
 CHEESE_GTK_REQUIRED=3.4.0
-LIBACCOUNTS_REQUIRED=1.1
-LIBSIGNON_REQUIRED=1.1
+LIBACCOUNTS_REQUIRED=1.4
+LIBSIGNON_REQUIRED=1.8
 MC_PLUGINS_REQUIRED=5.13.1
 
 # Use --enable-maintainer-mode to disable deprecated symbols,
@@ -84,15 +87,25 @@ MC_PLUGINS_REQUIRED=5.13.1
 #ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 #GNOME_MAINTAINER_MODE_DEFINES
 
-# egg-list-box
+# tp-account-widgets
 prev_top_build_prefix=$ac_top_build_prefix
 prev_ac_configure_args=$ac_configure_args
-AX_CONFIG_DIR([libempathy-gtk/egg-list-box])
+ac_configure_args="$ac_configure_args --with-pkgdatadir=${datadir}/empathy"
+ac_configure_args="$ac_configure_args --with-gettext-package=empathy-tpaw"
+ifelse(empathy_released, 1, [],
+    [
+        ac_configure_args="$ac_configure_args --enable-unreleased-checks"
+    ])
+AX_CONFIG_DIR([telepathy-account-widgets])
 ac_top_build_prefix=$prev_top_build_prefix
 ac_configure_args=$prev_ac_configure_args
 
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"libempathy-gtk/egg-list-box
-PKG_CHECK_MODULES(EGGLISTBOX, egg-list-box)
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-account-widgets/
+PKG_CHECK_MODULES(TPAW, telepathy-account-widgets)
+
+EMPATHY_UOA_PROVIDER=`pkg-config --variable=uoa_provider telepathy-account-widgets`
+AC_DEFINE_UNQUOTED(EMPATHY_UOA_PROVIDER, "$EMPATHY_UOA_PROVIDER",
+   [Name of provider for accounts imported from libaccounts])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -119,6 +132,9 @@ LT_INIT
 
 AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
 GLIB_GSETTINGS
+
+GLIB_COMPILE_RESOURCES=`$PKG_CONFIG gio-2.0 --variable=glib_compile_resources`
+AC_SUBST(GLIB_COMPILE_RESOURCES)
 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
 AC_SUBST(GLIB_GENMARSHAL)
 
@@ -213,7 +229,7 @@ PKG_CHECK_MODULES(EMPATHY,
    libpulse-mainloop-glib
    webkitgtk-3.0 >= $WEBKIT_REQUIRED
    libsoup-2.4
-   gee-1.0
+   gee-0.8
 ])
 
 # -----------------------------------------------------------
@@ -225,19 +241,20 @@ 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
+     cogl-1.0
   ], have_gst1="yes", have_gst1="no")
 
   if test "x$have_gst1" = "xyes"; then
@@ -255,7 +272,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
@@ -267,10 +284,6 @@ fi
 AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
    [Name of provider for accounts imported from GOA])
 
-AC_DEFINE(EMPATHY_UOA_PROVIDER,
-    "im.telepathy.Account.Storage.UOA",
-   [Name of provider for accounts imported from libaccounts])
-
 # -----------------------------------------------------------
 # Enable debug
 # -----------------------------------------------------------
@@ -403,11 +416,18 @@ AC_ARG_ENABLE(location,
 if test "x$enable_location" != "xno"; then
    PKG_CHECK_MODULES(GEOCLUE,
    [
-      geoclue >= $GEOCLUE_REQUIRED
+      geoclue-2.0 >= $GEOCLUE_REQUIRED
    ], have_geoclue="yes", have_geoclue="no")
 
    if test "x$have_geoclue" = "xyes"; then
-      AC_DEFINE(HAVE_GEOCLUE, 1, [Define if you have geoclue])
+      GEOCLUE_XML_FILE=`pkg-config --variable=dbus_interface geoclue-2.0`
+      if test "x$GEOCLUE_XML_FILE" = "x"; then
+        echo "Can't find dbus_interface variable in geoclue-2.0.pc"
+        have_geoclue="no"
+      else
+        AC_DEFINE(HAVE_GEOCLUE, 1, [Define if you have geoclue-2])
+        AC_SUBST(GEOCLUE_XML_FILE)
+      fi
    fi
 else
    have_geoclue="no"
@@ -434,7 +454,7 @@ AC_ARG_ENABLE(geocode,
 if test "x$enable_geocode" != "xno"; then
    PKG_CHECK_MODULES(GEOCODE,
    [
-      geocode-glib
+      geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED
    ], have_geocode="yes", have_geocode="no")
 
    if test "x$have_geocode" = "xyes"; then