summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/libxkbcommon/Config.in1
-rw-r--r--package/libxkbcommon/libxkbcommon.mk7
2 files changed, 8 insertions, 0 deletions
diff --git a/package/libxkbcommon/Config.in b/package/libxkbcommon/Config.in
index 0a52c6f43..4da12897f 100644
--- a/package/libxkbcommon/Config.in
+++ b/package/libxkbcommon/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_LIBXKBCOMMON
bool "libxkbcommon"
+ select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7
help
xkbcommon is a keymap compiler and support library which
processes a reduced subset of keymaps as defined by the XKB
diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk
index 2d3050690..12d5f1614 100644
--- a/package/libxkbcommon/libxkbcommon.mk
+++ b/package/libxkbcommon/libxkbcommon.mk
@@ -15,4 +15,11 @@ LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex
# uses C99 features
LIBXKBCOMMON_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
+ifeq ($(BR2_PACKAGE_XORG7),y)
+LIBXKBCOMMON_CONF_OPTS += --enable-x11
+LIBXKBCOMMON_DEPENDENCIES += libxcb
+else
+LIBXKBCOMMON_CONF_OPTS += --disable-x11
+endif
+
$(eval $(autotools-package))