dnl If not 1, append datestamp to the version number
-m4_define(empathy_released, 1)
+m4_define(empathy_released, 0)
-m4_define([empathy_major_version], [2])
-m4_define([empathy_minor_version], [91])
-m4_define([empathy_micro_version], [90])
-m4_define([empathy_nano_version], [1])
+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'
m4_define([empathy_base_version],
# Minimal version required
# Hardp deps
-FOLKS_REQUIRED=0.3.5
-GLIB_REQUIRED=2.27.2
+FOLKS_REQUIRED=0.4.0
+GLIB_REQUIRED=2.28.0
GNUTLS_REQUIRED=2.8.5
-GTK_REQUIRED=2.99.0
+GTK_REQUIRED=3.0.2
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.13.14
+TELEPATHY_GLIB_REQUIRED=0.14.3
TELEPATHY_LOGGER=0.2.0
# Optional deps
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
# -----------------------------------------------------------
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}