From 0662d66db7bf28f275d4c535a49cd5ec1689d291 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 4 Apr 2012 11:36:20 +0200 Subject: Depend on Clutter 1.10 Needed for clutter_actor_set_margin_* which is already used. Shell 3.4 depends of this version as well so that won't be an issue for distribution shipping GNOME 3.4. https://bugzilla.gnome.org/show_bug.cgi?id=673444 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 29e161996..9d683863d 100644 --- a/configure.ac +++ b/configure.ac @@ -45,9 +45,9 @@ GTK_REQUIRED=3.3.6 AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_4, [Ignore post 3.4 deprecations]) AC_DEFINE(GDK_VERSION_MAX_REQUIRED, GDK_VERSION_3_4, [Prevent post 3.4 APIs]) -CLUTTER_REQUIRED=1.8.0 +CLUTTER_REQUIRED=1.10.0 AC_DEFINE(CLUTTER_VERSION_MIN_REQUIRED, CLUTTER_VERSION_1_8, [Ignore post 1.8 deprecations]) -AC_DEFINE(CLUTTER_VERSION_MAX, CLUTTER_VERSION_1_8, [Prevent post 1.8 APIs]) +AC_DEFINE(CLUTTER_VERSION_MAX, CLUTTER_VERSION_1_10, [Prevent post 1.10 APIs]) CLUTTER_GTK_REQUIRED=0.90.3 CLUTTER_GST_REQUIRED=1.5.2 -- cgit v1.2.3 From 4f6083d07fa7b9dbba458e75e6563b4c77a4bf85 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 4 Apr 2012 11:23:29 +0200 Subject: macros checking are *_MAX_ALLOWED --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 9d683863d..028174ad5 100644 --- a/configure.ac +++ b/configure.ac @@ -39,15 +39,15 @@ GNUTLS_REQUIRED=2.8.5 GLIB_REQUIRED=2.30.0 AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations]) -AC_DEFINE(GLIB_VERSION_MAX_REQUIRED, GLIB_VERSION_2_30, [Prevent post 2.30 APIs]) +AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_30, [Prevent post 2.30 APIs]) GTK_REQUIRED=3.3.6 AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_4, [Ignore post 3.4 deprecations]) -AC_DEFINE(GDK_VERSION_MAX_REQUIRED, GDK_VERSION_3_4, [Prevent post 3.4 APIs]) +AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_4, [Prevent post 3.4 APIs]) CLUTTER_REQUIRED=1.10.0 AC_DEFINE(CLUTTER_VERSION_MIN_REQUIRED, CLUTTER_VERSION_1_8, [Ignore post 1.8 deprecations]) -AC_DEFINE(CLUTTER_VERSION_MAX, CLUTTER_VERSION_1_10, [Prevent post 1.10 APIs]) +AC_DEFINE(CLUTTER_VERSION_MAX_ALLOWED, CLUTTER_VERSION_1_10, [Prevent post 1.10 APIs]) CLUTTER_GTK_REQUIRED=0.90.3 CLUTTER_GST_REQUIRED=1.5.2 -- cgit v1.2.3