diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2015-07-21 17:49:08 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2015-07-21 17:49:08 -0400 |
| commit | bb0b54526f3353f22a9f56344149b5054df7bed9 (patch) | |
| tree | 828036d04b60e48a8003a38193c5df3f118fefad /configure.ac | |
| parent | 1e981790de8eee1d9f81bb62ca13eb2e9b4e6431 (diff) | |
| download | gtk+-bb0b54526f3353f22a9f56344149b5054df7bed9.tar.gz | |
Use versioned deprecations more seriously
I invadvertendly introduced a dependency on a recent GLib recently,
by cherry-picking a fix that used new GLib API. This commit will
help catching such errors before release, by using the versioned
deprecation machinery to turn such events into build-time
warnings.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 939b388643..6d9da29c07 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,19 @@ AC_CANONICAL_HOST m4_define([gtk_binary_version], [3.0.0]) # required versions of other packages -m4_define([glib_required_version], [2.43.4]) +m4_define([glib_required_major], [2]) +m4_define([glib_required_minor], [43]) +m4_define([glib_required_micro], [3]) +m4_define([glib_required_version], + [glib_required_major.glib_required_minor.glib_required_micro]) +m4_define([glib_min_required_minor], + [m4_eval(glib_required_minor - (glib_required_minor % 2))]) +m4_define([glib_max_allowed_minor], + [m4_eval(glib_required_minor + (glib_required_minor % 2))]) +m4_define([glib_min_required_version], m4_join([_], [GLIB_VERSION], glib_required_major, glib_min_required_minor)) +m4_define([glib_max_allowed_version], m4_join([_], [GLIB_VERSION], glib_required_major, glib_max_allowed_minor)) +GLIB_VERSION_CFLAGS="-DGLIB_MIN_REQUIRED_VERSION=glib_min_required_version -DGLIB_MAX_ALLOWED_VERSION=glib_max_allowed_version" + m4_define([pango_required_version], [1.37.1]) m4_define([atk_required_version], [2.15.1]) m4_define([cairo_required_version], [1.14.0]) @@ -348,7 +360,7 @@ backend_immodules= have_gio_unix=no GDK_BACKENDS= GDK_EXTRA_LIBS= -GDK_EXTRA_CFLAGS= +GDK_EXTRA_CFLAGS="$GLIB_VERSION_CFLAGS" GDK_WINDOWING= PANGO_PACKAGES="pango pangocairo" |