Handle deprecation of g_settings_list_keys in gio 2.46

This commit is contained in:
Geert Janssens
2017-03-16 23:10:26 +01:00
parent 8acbc41c61
commit dcef648044
4 changed files with 119 additions and 73 deletions

View File

@@ -334,8 +334,15 @@ AM_BINRELOC
### Glib checks.
# We require glib >= 2.40
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.40 gthread-2.0
gobject-2.0 gmodule-2.0)
# 2.46 deprecates g_settings_list_keys
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.46 gio-2.0 gthread-2.0 gobject-2.0 gmodule-2.0,
[
AC_DEFINE([HAVE_GLIB_2_46], [1], [Configure g_settings_list_keys deprecation])
],
[
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.40 gio-2.0 gthread-2.0
gobject-2.0 gmodule-2.0)
])
AC_CHECK_HEADERS(dirent.h dlfcn.h dl.h utmp.h locale.h mcheck.h unistd.h wctype.h)