Run from the source directory without installing

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d3cd1e1a1f8ff222dc5c73bc41e751bbbbd28373..71b6fd6bda5c1950e5abfd59665a60a035f982b4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ m4_define(empathy_released, 0)
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [3])
 m4_define([empathy_micro_version], [90])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_nano_version], [2])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
@@ -43,7 +43,6 @@ 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.18
 TELEPATHY_FARSTREAM_REQUIRED=0.2.1
 TELEPATHY_GLIB_REQUIRED=0.17.5
 TELEPATHY_LOGGER=0.2.10
@@ -210,6 +209,24 @@ PKG_CHECK_MODULES(EMPATHY_CALL,
 AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
    [Name of provider for accounts imported from GOA])
 
+# -----------------------------------------------------------
+# Build empathy-av?
+# -----------------------------------------------------------
+AC_ARG_ENABLE(empathy-av,
+            AS_HELP_STRING([--enable-empathy-av=@<:@no/yes@:>@],
+            [build empathy-av (legacy call UI)]),,
+            [enable_empathy_av=no])
+if test "x$enable_empathy_av" != "xno" ; then
+   PKG_CHECK_MODULES(EMPATHY_AV,
+   [
+      farstream-0.1
+      telepathy-farstream >= $TELEPATHY_FARSTREAM_REQUIRED
+   ])
+   AC_DEFINE(HAVE_EMPATHY_AV, 1, [Define if you have StreamedMedia channel support])
+   have_empathy_av=yes
+fi
+AM_CONDITIONAL(HAVE_EMPATHY_AV, test "x$have_empathy_av" = "xyes")
+
 # -----------------------------------------------------------
 # Call support in tp-logger
 # -----------------------------------------------------------
@@ -413,8 +430,8 @@ if test "x$enable_map" != "xno"; then
    PKG_CHECK_MODULES(LIBCHAMPLAIN,
     [
        clutter-gtk-1.0
-       champlain-gtk-0.12
-       champlain-0.12 >= $CHAMPLAIN_REQUIRED
+       champlain-gtk-0.14
+       champlain-0.14 >= $CHAMPLAIN_REQUIRED
     ], have_libchamplain="yes", have_libchamplain="no")
 
    if test "x$have_libchamplain" = "xyes"; then
@@ -669,4 +686,5 @@ Configure summary:
        GOA MC plugin...............:  ${have_goa}
        Salut E-D-S support.........:  ${with_eds}
        Exp. Call log support.......:  ${have_call_logs}
+       empathy-av (legacy).........:  ${enable_empathy_av}
 "