Check for telepathy-yell if requested

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 15ef4973ee4383545e7a2ad5429e9e4b8bbc761f..714133eacc6b3f821744e6f357c3e7330c461f0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl If not 1, append datestamp to the version number
 m4_define(empathy_released, 0)
 
-m4_define([empathy_major_version], [2])
-m4_define([empathy_minor_version], [91])
-m4_define([empathy_micro_version], [91])
+m4_define([empathy_major_version], [3])
+m4_define([empathy_minor_version], [1])
+m4_define([empathy_micro_version], [1])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -31,8 +31,8 @@ AC_COPYRIGHT([
 # Minimal version required
 
 # Hardp deps
-FOLKS_REQUIRED=0.3.5
-GLIB_REQUIRED=2.27.2
+FOLKS_REQUIRED=0.5.1
+GLIB_REQUIRED=2.28.0
 GNUTLS_REQUIRED=2.8.5
 GTK_REQUIRED=3.0.2
 KEYRING_REQUIRED=2.26.0
@@ -40,7 +40,7 @@ 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.13.16
+TELEPATHY_GLIB_REQUIRED=0.15.1
 TELEPATHY_LOGGER=0.2.0
 
 # Optional deps
@@ -62,6 +62,12 @@ GNOME_CONTROL_CENTER_REQUIRED=2.31.4
 #ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 #GNOME_MAINTAINER_MODE_DEFINES
 
+# telepathy-yell
+prev_top_build_prefix=$ac_top_build_prefix
+AX_CONFIG_DIR([telepathy-yell])
+ac_top_build_prefix=$prev_top_build_prefix
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-yell/telepathy-yell
+
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
@@ -172,6 +178,17 @@ PKG_CHECK_MODULES(EMPATHY_AV,
    telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
 ])
 
+# -----------------------------------------------------------
+# Call interface
+# -----------------------------------------------------------
+AC_ARG_WITH(call,
+            AC_HELP_STRING([--with-call], [build with Call interface support]),,
+            [with_call=yes])
+if test "x$with_call" = "xyes" ; then
+   PKG_CHECK_MODULES(YELL, [telepathy-yell])
+   AC_DEFINE(HAVE_CALL, 1, [Define if we have Call interface support])
+fi
+
 # -----------------------------------------------------------
 # evolution-data-server (about-me)
 # -----------------------------------------------------------
@@ -464,6 +481,25 @@ AM_CONDITIONAL(HAVE_CONTROL_CENTER_EMBEDDING, test "x$have_control_center_embedd
 AC_SUBST(CONTROL_CENTER_EMBEDDING_CFLAGS)
 AC_SUBST(CONTROL_CENTER_EMBEDDING_LIBS)
 
+# Optional dependency for avatar selection
+AC_ARG_WITH([cheese],
+            AS_HELP_STRING([--with-cheese], [enable cheese webcam support]),,
+            with_cheese=auto)
+
+if test x"$with_cheese" != x"no" ; then
+   PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= 2.91.91.1, [have_cheese=yes], [have_cheese=no])
+   if test x${have_cheese} = xyes; then
+     AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support])
+   fi
+   if test x${with_cheese} = xyes && test x${have_cheese} = xno; then
+     AC_MSG_ERROR([Cheese configured but not found])
+   fi
+else
+   have_cheese=no
+fi
+AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
+
+
 # -----------------------------------------------------------
 # Coding style checks
 # -----------------------------------------------------------
@@ -509,6 +545,7 @@ Configure summary:
        Adium themes (Webkit).......:  ${have_webkit}
        Meego widgets ..............:  ${have_meego}
        Control center embedding....:  ${have_control_center_embedding}
+       Cheese webcam support ......:  ${have_cheese}
 
     Connectivity:
        NetworkManager integration..:  ${have_nm}