diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-05 13:00:22 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-05 13:00:22 +0100 |
| commit | 3b1ad7f7c583fbb80c5a084c78b926ecaaca0aa9 (patch) | |
| tree | 08ea4ccea83326749159fa3eecceaebc40e23504 /configure.ac | |
| parent | 71fc71fe5552c8292564ea0662b30fd535d8565f (diff) | |
| parent | 540e5692e07d48fb41a4e977e0c9078fa19bd677 (diff) | |
| download | dbus-3b1ad7f7c583fbb80c5a084c78b926ecaaca0aa9.tar.gz | |
Merge branch 'dbus-1.6'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b6430c52..aff812e6 100644 --- a/configure.ac +++ b/configure.ac @@ -212,7 +212,7 @@ fi # or binaries. AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_26], [Ignore post-2.26 deprecations]) -AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_26], [Prevent post-2.26 APIs]) +AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_32], [Prevent post-2.32 APIs]) with_glib=yes |