X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=11482c399de49e9780a08c911f6c119e28d5e996;hp=f873cd6dbb15d02f7346a836c84d521b8de7a5df;hb=f9951a15e44d4c23c74d0237bfba9112ef7b81a2;hpb=b5be743912a828d44439693a7c5da2d8fafba7ca diff --git a/configure.ac b/configure.ac index f873cd6d..11482c39 100644 --- 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_released, 1) m4_define([empathy_major_version], [3]) -m4_define([empathy_minor_version], [7]) -m4_define([empathy_micro_version], [3]) +m4_define([empathy_minor_version], [9]) +m4_define([empathy_micro_version], [1]) m4_define([empathy_nano_version], [0]) dnl Display the nano_version only if it's not '0' @@ -34,7 +34,7 @@ AC_COPYRIGHT([ # Minimal version required # Hardp deps -FOLKS_REQUIRED=0.7.3 +FOLKS_REQUIRED=0.9.0 GNUTLS_REQUIRED=2.8.5 GLIB_REQUIRED=2.33.3 @@ -63,7 +63,7 @@ LIBSECRET_REQUIRED=0.5 GCR_REQUIRED=2.91.4 LIBCANBERRA_GTK_REQUIRED=0.25 LIBNOTIFY_REQUIRED=0.7.0 -TELEPATHY_LOGGER=0.6.0 +TELEPATHY_LOGGER=0.8.0 WEBKIT_REQUIRED=1.9.1 GOA_REQUIRED=3.5.1 @@ -122,6 +122,9 @@ LT_INIT 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) @@ -216,7 +219,7 @@ PKG_CHECK_MODULES(EMPATHY, libpulse-mainloop-glib webkitgtk-3.0 >= $WEBKIT_REQUIRED libsoup-2.4 - gee-1.0 + gee-0.8 ]) # ----------------------------------------------------------- @@ -241,6 +244,7 @@ if test "x$enable_gst1" != "xno"; then 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