dnl If not 1, append datestamp to the version number
-m4_define(empathy_released, 0)
+m4_define(empathy_released, 1)
m4_define([empathy_major_version], [3])
-m4_define([empathy_minor_version], [5])
-m4_define([empathy_micro_version], [91])
-m4_define([empathy_nano_version], [1])
+m4_define([empathy_minor_version], [9])
+m4_define([empathy_micro_version], [90])
+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.7.1
+FOLKS_REQUIRED=0.9.0
GNUTLS_REQUIRED=2.8.5
GLIB_REQUIRED=2.33.3
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])
+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.8.0
+WEBKIT_REQUIRED=1.9.1
GOA_REQUIRED=3.5.1
# Optional deps
ENCHANT_REQUIRED=1.2.0
GEOCLUE_REQUIRED=0.12
+GEOCODE_GLIB_REQUIRED=0.99.1
ISO_CODES_REQUIRED=0.35
NAUTILUS_SENDTO_REQUIRED=2.90.0
NETWORK_MANAGER_REQUIRED=0.7.0
CHAMPLAIN_REQUIRED=0.12.1
CHEESE_GTK_REQUIRED=3.4.0
-LIBACCOUNTS_REQUIRED=1.1
+LIBACCOUNTS_REQUIRED=1.4
LIBSIGNON_REQUIRED=1.1
MC_PLUGINS_REQUIRED=5.13.1
#ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
#GNOME_MAINTAINER_MODE_DEFINES
+# tp-account-widgets
+prev_top_build_prefix=$ac_top_build_prefix
+prev_ac_configure_args=$ac_configure_args
+ac_configure_args="$ac_configure_args --with-pkgdatadir=${datadir}/empathy"
+ifelse(empathy_released, 1, [],
+ [
+ ac_configure_args="$ac_configure_args --enable-unreleased-checks"
+ ])
+AX_CONFIG_DIR([telepathy-account-widgets])
+ac_top_build_prefix=$prev_top_build_prefix
+ac_configure_args=$prev_ac_configure_args
+
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-account-widgets/
+PKG_CHECK_MODULES(TPAW, telepathy-account-widgets)
+
+EMPATHY_UOA_PROVIDER=`pkg-config --variable=uoa_provider telepathy-account-widgets`
+AC_DEFINE_UNQUOTED(EMPATHY_UOA_PROVIDER, "$EMPATHY_UOA_PROVIDER",
+ [Name of provider for accounts imported from libaccounts])
+
# egg-list-box
prev_top_build_prefix=$ac_top_build_prefix
prev_ac_configure_args=$ac_configure_args
AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
GLIB_GSETTINGS
+
+GLIB_COMPILE_RESOURCES=`$PKG_CONFIG gio-2.0 --variable=glib_compile_resources`
+AC_SUBST(GLIB_COMPILE_RESOURCES)
GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
AC_SUBST(GLIB_GENMARSHAL)
libpulse-mainloop-glib
webkitgtk-3.0 >= $WEBKIT_REQUIRED
libsoup-2.4
- gee-1.0
+ gee-0.8
])
# -----------------------------------------------------------
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
+ gstreamer-1.0
+ gstreamer-audio-1.0
+ gstreamer-video-1.0
+ cogl-1.0
], have_gst1="yes", have_gst1="no")
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
AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
[Name of provider for accounts imported from GOA])
-AC_DEFINE(EMPATHY_UOA_PROVIDER,
- "im.telepathy.Account.Storage.UOA",
- [Name of provider for accounts imported from libaccounts])
-
# -----------------------------------------------------------
# Enable debug
# -----------------------------------------------------------
if test "x$enable_geocode" != "xno"; then
PKG_CHECK_MODULES(GEOCODE,
[
- geocode-glib
+ geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED
], have_geocode="yes", have_geocode="no")
if test "x$have_geocode" = "xyes"; then