aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-04-04 17:43:20 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-04-04 17:43:20 +0800
commitf86e7b5be4d7721f7f0bf3a9a7a140109486c48b (patch)
tree08ad0346759ff52bd8694a39b2e96daf79c8c6e5
parent52961fbbf502b79be4e913d81f3c6718c4a15d59 (diff)
parent4f6083d07fa7b9dbba458e75e6563b4c77a4bf85 (diff)
downloadgsoc2013-empathy-f86e7b5be4d7721f7f0bf3a9a7a140109486c48b.tar
gsoc2013-empathy-f86e7b5be4d7721f7f0bf3a9a7a140109486c48b.tar.gz
gsoc2013-empathy-f86e7b5be4d7721f7f0bf3a9a7a140109486c48b.tar.bz2
gsoc2013-empathy-f86e7b5be4d7721f7f0bf3a9a7a140109486c48b.tar.lz
gsoc2013-empathy-f86e7b5be4d7721f7f0bf3a9a7a140109486c48b.tar.xz
gsoc2013-empathy-f86e7b5be4d7721f7f0bf3a9a7a140109486c48b.tar.zst
gsoc2013-empathy-f86e7b5be4d7721f7f0bf3a9a7a140109486c48b.zip
Merge branch 'gnome-3-4'
-rw-r--r--configure.ac8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 33738e604..a31c29c66 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.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_ALLOWED, CLUTTER_VERSION_1_10, [Prevent post 1.10 APIs])
CLUTTER_GTK_REQUIRED=0.90.3
CLUTTER_GST_REQUIRED=1.5.2