[empathy: 1/4] Make use of new Clutter macros to check API we are using
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 1/4] Make use of new Clutter macros to check API we are using
- Date: Mon, 12 Mar 2012 12:02:33 +0000 (UTC)
commit 48370f1bead25fff25e3694f4e87d0b33068fdb3
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed Mar 7 11:04:18 2012 +0100
Make use of new Clutter macros to check API we are using
https://bugzilla.gnome.org/show_bug.cgi?id=669673
configure.ac | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4287601..70ca492 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])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]