add empathy_contact_remove_from_contact_list()

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 25c8df8e63ee95dc010890930b07389735b040c6..0e0ac9bba9c8e7accc8d3ab3efc7615030567065 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], [1])
-m4_define([empathy_micro_version], [92])
+m4_define([empathy_minor_version], [3])
+m4_define([empathy_micro_version], [1])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -35,7 +35,7 @@ AC_COPYRIGHT([
 
 # Hardp deps
 FOLKS_REQUIRED=0.6.2
-GLIB_REQUIRED=2.28.0
+GLIB_REQUIRED=2.30.0
 GNUTLS_REQUIRED=2.8.5
 GTK_REQUIRED=3.0.2
 GSTREAMER_REQUIRED=0.10.32
@@ -43,10 +43,11 @@ KEYRING_REQUIRED=2.26.0
 GCR_REQUIRED=2.91.4
 LIBCANBERRA_GTK_REQUIRED=0.25
 LIBNOTIFY_REQUIRED=0.7.0
-TELEPATHY_FARSIGHT_REQUIRED=0.0.14
-TELEPATHY_GLIB_REQUIRED=0.15.5
+TELEPATHY_FARSIGHT_REQUIRED=0.0.18
+TELEPATHY_GLIB_REQUIRED=0.17.0
 TELEPATHY_LOGGER=0.2.10
 WEBKIT_REQUIRED=1.3.13
+GOA_REQUIRED=3.3.0
 
 # Optional deps
 CLUTTER_REQUIRED=1.7.14
@@ -64,6 +65,11 @@ NETWORK_MANAGER_REQUIRED=0.7.0
 #ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 #GNOME_MAINTAINER_MODE_DEFINES
 
+# Disable GLib deprecation warnings for now; we don't want to bump the GLib dep
+# and make things harder for contributiors without good reason. We'll re-enable
+# those warnings later during the cycle (bgo #662662)
+AC_DEFINE(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, [Build with GLib deprecated])
+
 # telepathy-yell
 prev_top_build_prefix=$ac_top_build_prefix
 prev_ac_configure_args=$ac_configure_args
@@ -194,6 +200,7 @@ PKG_CHECK_MODULES(EMPATHY,
    libpulse
    libpulse-mainloop-glib
    webkitgtk-3.0 >= $WEBKIT_REQUIRED
+   libsoup-2.4
 ])
 
 PKG_CHECK_MODULES(YELL, [telepathy-yell])
@@ -204,6 +211,9 @@ PKG_CHECK_MODULES(EMPATHY_AV,
    telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
 ])
 
+AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
+   [Name of provider for accounts imported from GOA])
+
 # -----------------------------------------------------------
 # Call interface
 # -----------------------------------------------------------
@@ -589,12 +599,13 @@ if test "x$enable_goa" != "xno"; then
    PKG_CHECK_MODULES(GOA,
     [
        mission-control-plugins
-       goa-1.0
+       goa-1.0 >= $GOA_REQUIRED
     ], have_goa="yes", have_goa="no")
 
    AC_MSG_CHECKING([Mission Control plugins dir])
    MISSION_CONTROL_PLUGINS_DIR=`pkg-config --variable=plugindir mission-control-plugins`
 
+   AC_MSG_RESULT([$MISSION_CONTROL_PLUGINS_DIR])
    AC_SUBST(MISSION_CONTROL_PLUGINS_DIR)
 else
    have_goa=no
@@ -604,6 +615,10 @@ if test "x$enable_goa" = "xyes" -a "x$have_goa" != "xyes"; then
    AC_MSG_ERROR([Could not find GOA dependencies.])
 fi
 
+if test "x$have_goa" = "xyes"; then
+   AC_DEFINE(HAVE_GOA, 1, [Define to 1 to enable GNOME Online Accounts])
+fi
+
 AM_CONDITIONAL(HAVE_GOA, test "x$have_goa" = "xyes")
 
 # Optional dependency for avatar selection