Merge branch 'gnome-3-6'

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 021ee438b4657aa42ee0d9dac1bcfac17b81382d..141a813f14dea4f41a0194b9e86a27f410aea48c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -55,14 +55,16 @@ 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
@@ -226,13 +228,13 @@ 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
@@ -256,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