diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-03-07 18:04:18 +0800 |
|---|---|---|
| committer | Emanuele Aina <emanuele.aina@collabora.com> | 2012-03-12 19:52:07 +0800 |
| commit | 48370f1bead25fff25e3694f4e87d0b33068fdb3 (patch) | |
| tree | 118f8a4e63a042e1d5a6aeb6c55d1676fa7e3f7c | |
| parent | 75a991eddf0106916146c30756274bbbd03c5904 (diff) | |
| download | gsoc2013-empathy-48370f1bead25fff25e3694f4e87d0b33068fdb3.tar gsoc2013-empathy-48370f1bead25fff25e3694f4e87d0b33068fdb3.tar.gz gsoc2013-empathy-48370f1bead25fff25e3694f4e87d0b33068fdb3.tar.bz2 gsoc2013-empathy-48370f1bead25fff25e3694f4e87d0b33068fdb3.tar.lz gsoc2013-empathy-48370f1bead25fff25e3694f4e87d0b33068fdb3.tar.xz gsoc2013-empathy-48370f1bead25fff25e3694f4e87d0b33068fdb3.tar.zst gsoc2013-empathy-48370f1bead25fff25e3694f4e87d0b33068fdb3.zip | |
Make use of new Clutter macros to check API we are using
https://bugzilla.gnome.org/show_bug.cgi?id=669673
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 42876013f..70ca49214 100644 --- a/configure.ac +++ b/configure.ac @@ -45,6 +45,12 @@ GTK_REQUIRED=3.0.2 AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_0, [Ignore post 3.0 deprecations]) AC_DEFINE(GDK_VERSION_MAX_REQUIRED, GDK_VERSION_3_0, [Prevent post 3.0 APIs]) +CLUTTER_REQUIRED=1.7.14 +AC_DEFINE(CLUTTER_VERSION_MIN_REQUIRED, CLUTTER_VERSION_1_6, [Ignore post 1.6 deprecations]) +AC_DEFINE(CLUTTER_VERSION_MAX, CLUTTER_VERSION_1_6, [Prevent post 1.6 APIs]) + +CLUTTER_GTK_REQUIRED=0.90.3 + GSTREAMER_REQUIRED=0.10.32 KEYRING_REQUIRED=2.26.0 GCR_REQUIRED=2.91.4 @@ -57,8 +63,6 @@ WEBKIT_REQUIRED=1.3.13 GOA_REQUIRED=3.3.0 # Optional deps -CLUTTER_REQUIRED=1.7.14 -CLUTTER_GTK_REQUIRED=0.90.3 ENCHANT_REQUIRED=1.2.0 GEOCLUE_REQUIRED=0.11 ISO_CODES_REQUIRED=0.35 @@ -73,9 +77,6 @@ CHAMPLAIN_REQUIRED=0.12.1 #ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"]) #GNOME_MAINTAINER_MODE_DEFINES -# FIXME: bgo #669673 -AC_DEFINE(CLUTTER_DISABLE_DEPRECATION_WARNINGS, 1, [Build with Clutter deprecated]) - AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([configure.ac]) |