X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=11482c399de49e9780a08c911f6c119e28d5e996;hp=88cc9e6e5781d9150b35095dadec08212774c786;hb=f9951a15e44d4c23c74d0237bfba9112ef7b81a2;hpb=03d0826e2278ee3d29a6214b12ba6ee7d48e0c7c diff --git a/configure.ac b/configure.ac index 88cc9e6e..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], [5]) -m4_define([empathy_micro_version], [90]) +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.1 +FOLKS_REQUIRED=0.9.0 GNUTLS_REQUIRED=2.8.5 GLIB_REQUIRED=2.33.3 @@ -50,34 +50,35 @@ AC_DEFINE(CLUTTER_VERSION_MIN_REQUIRED, CLUTTER_VERSION_1_8, [Ignore post 1.8 de AC_DEFINE(CLUTTER_VERSION_MAX_ALLOWED, CLUTTER_VERSION_1_10, [Prevent post 1.10 APIs]) CLUTTER_GTK_REQUIRED=1.1.2 -CLUTTER_GST_REQUIRED=1.5.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_FARSTREAM_REQUIRED=0.2.1 -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.0 +MC_PLUGINS_REQUIRED=5.13.1 # Use --enable-maintainer-mode to disable deprecated symbols, # disable single include and enable GSEAL. If this is not a released empathy, @@ -121,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) @@ -215,19 +219,57 @@ PKG_CHECK_MODULES(EMPATHY, libpulse-mainloop-glib webkitgtk-3.0 >= $WEBKIT_REQUIRED libsoup-2.4 - gee-1.0 + gee-0.8 ]) -PKG_CHECK_MODULES(EMPATHY_CALL, -[ - farstream-0.1 - telepathy-farstream >= $TELEPATHY_FARSTREAM_REQUIRED - clutter-1.0 >= $CLUTTER_REQUIRED - clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED - clutter-gst-1.0 >= $CLUTTER_GST_REQUIRED - gstreamer-0.10 >= $GSTREAMER_REQUIRED - gstreamer-interfaces-0.10 -]) +# ----------------------------------------------------------- +# GStreamer +# ----------------------------------------------------------- +AC_ARG_ENABLE(gst-1.0, + AS_HELP_STRING([--enable-gst-1.0=@<:@no/yes/auto@:>@], + [build with GStreamer 1.0]), + enable_gst1=$enableval, + enable_gst1=auto) + +# 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 >= $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 + AC_DEFINE(HAVE_GST1, 1, [Build with GStreamer 1.0]) + fi +fi + +if test "x$enable_gst1" = "xyes" -a "x$have_gst1" != "xyes"; then + AC_MSG_ERROR([Could not find GStreamer 1.0 dependencies: + +$EMPATHY_CALL_PKG_ERRORS]) +fi + +if test "x$have_gst1" != "xyes"; then + PKG_CHECK_MODULES(EMPATHY_CALL, + [ + farstream-0.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 + gstreamer-0.10 >= $GSTREAMER_REQUIRED + gstreamer-interfaces-0.10 + ]) +fi AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts", [Name of provider for accounts imported from GOA]) @@ -399,7 +441,7 @@ AC_ARG_ENABLE(geocode, if test "x$enable_geocode" != "xno"; then PKG_CHECK_MODULES(GEOCODE, [ - geocode-glib + geocode-glib >= $GEOCODE_GLIB_REQUIRED ], have_geocode="yes", have_geocode="no") if test "x$have_geocode" = "xyes"; then @@ -481,7 +523,7 @@ AC_ARG_WITH([cheese], with_cheese=auto) if test x"$with_cheese" != x"no" ; then - PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= CHEESE_GTK_REQUIRED, [have_cheese=yes], [have_cheese=no]) + PKG_CHECK_MODULES(CHEESE, cheese-gtk >= CHEESE_GTK_REQUIRED, [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 @@ -603,6 +645,7 @@ AC_CONFIG_FILES([ ubuntu-online-accounts/Makefile ubuntu-online-accounts/mc-plugin/Makefile ubuntu-online-accounts/cc-plugins/Makefile + ubuntu-online-accounts/cc-plugins/account-plugins/Makefile ubuntu-online-accounts/cc-plugins/providers/Makefile ubuntu-online-accounts/cc-plugins/services/Makefile ubuntu-online-accounts/cc-plugins/app-plugin/Makefile @@ -623,6 +666,7 @@ Configure summary: Linker Flags................: ${LDFLAGS} Prefix......................: ${prefix} Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS} + Use GStreamer 1.0...........: ${have_gst1} Features: Spell checking (enchant)....: ${have_enchant}