diff options
author | Viktor Odintsev <ninetls@xfce.org> | 2017-08-19 00:49:28 +0300 |
---|---|---|
committer | Viktor Odintsev <ninetls@xfce.org> | 2017-08-19 00:49:28 +0300 |
commit | fc93e65827c70db817953a371d38a548b4806a4a (patch) | |
tree | 574e6198345b45beaa0b069c6dddfb295441c22e /configure.ac.in | |
parent | 01e33319216f5a0aad00ba0bce3e7560e2dabda7 (diff) | |
download | xfwm4-fc93e65827c70db817953a371d38a548b4806a4a.tar.gz |
Add xfconf 4.13 support
Diffstat (limited to 'configure.ac.in')
-rw-r--r-- | configure.ac.in | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac.in b/configure.ac.in index 5774ee809..a9f951c68 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -14,7 +14,8 @@ m4_define([gtk_minimum_version], [3.20.0]) m4_define([xfce_minimum_version], [4.8.0]) m4_define([libxfce4ui_minimum_version], [4.12.0]) m4_define([libxfce4kbd_private_minimum_version], [4.12.0]) -m4_define([xfconf_minimum_version], [4.12.0]) +m4_define([xfconf_minimum_version], [4.13.0]) +m4_define([xfconf_legacy_version], [4.12.0]) m4_define([xcomposite_minimum_version], [0.2]) m4_define([wnck_minimum_version], [3.14]) m4_define([startup_notification_minimum_version], [0.5]) @@ -93,10 +94,12 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [gtk_minimum_version]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [xfce_minimum_version]) XDT_CHECK_PACKAGE([LIBXFCE4UI], libxfce4ui-2, [libxfce4ui_minimum_version]) XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], libxfce4kbd-private-3, [libxfce4kbd_private_minimum_version]) -XDT_CHECK_PACKAGE([LIBXFCONF], libxfconf-0, [xfconf_minimum_version]) +XDT_CHECK_PACKAGE([LIBXFCONF], libxfconf-0, [xfconf_minimum_version],, +[ + AC_DEFINE([XFCONF_LEGACY], [], [Use dbus-glib provided by xfconf 4.12 to obtain array type]) + XDT_CHECK_PACKAGE([LIBXFCONF], [libxfconf-0], [xfconf_legacy_version]) +]) XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-3.0], [wnck_minimum_version]) -XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0]) -XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.72]) XDT_CHECK_PACKAGE([XINERAMA], [xinerama], [0]) AS_IF([test "x$USE_MAINTAINER_MODE" = "xyes"], |