X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=15d27f372eae3e31cfd9760302ac5dd925fe8313;hp=3eea28357cba4dc9aa54e0e1d613ec4d4784e9f9;hb=8272468f01ba232565a518bdd7c8893eca751495;hpb=d641d0d903b9847864acae4a47aa948131aa50b0

diff --git a/configure.ac b/configure.ac
index 3eea2835..15d27f37 100644
--- 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], [90])
+m4_define([empathy_minor_version], [6])
+m4_define([empathy_micro_version], [2])
 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,7 +51,7 @@ 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])
@@ -75,7 +75,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,
@@ -221,10 +221,12 @@ PKG_CHECK_MODULES(EMPATHY,
 # -----------------------------------------------------------
 AC_ARG_ENABLE(gst-1.0,
               AS_HELP_STRING([--enable-gst-1.0=@<:@no/yes/auto@:>@],
-                             [build with GStreamer 1.0]), enable_gst1=yes,
+                             [build with GStreamer 1.0]),
+                             enable_gst1=$enableval,
                              enable_gst1=auto)
 
 # Try to use GStreamer 1.à if available
+have_gst1="no"
 if test "x$enable_gst1" != "xno"; then
   PKG_CHECK_MODULES(EMPATHY_CALL,
   [
@@ -233,6 +235,9 @@ if test "x$enable_gst1" != "xno"; then
      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
@@ -633,6 +638,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