aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2015-06-03 22:41:45 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-06-09 23:09:13 +0200
commitfe13eac8c8a5c5af84a8bbbc8f08a5e39543272a (patch)
treeed41b80598feb033338c3fad196e43467ec6e622
parent12a9e85f031626fa2b557e78c0db834dcdc99d1e (diff)
downloadbuildroot-fe13eac8c8a5c5af84a8bbbc8f08a5e39543272a.tar.gz
buildroot-fe13eac8c8a5c5af84a8bbbc8f08a5e39543272a.tar.bz2
package/matchbox: xlib-libXcursor is an optional dependency
matchbox selects xlib-libXcursor, but does not build-depend on it. But xlib-libXcursor is only an optional dependency. Fix that by removing the select, and properly build-depend on it when it is enabled. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/matchbox/Config.in1
-rw-r--r--package/matchbox/matchbox.mk4
2 files changed, 4 insertions, 1 deletions
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 0c7e5ea9f9..3a9f118f4a 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_FONTCONFIG
select BR2_PACKAGE_EXPAT
- select BR2_PACKAGE_XLIB_LIBXCURSOR
select BR2_PACKAGE_MATCHBOX_LIB
help
Matchbox is an Open Source base environment for the X Window
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index 1abcfd8482..3b6a0eb388 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -35,4 +35,8 @@ else
MATCHBOX_CONF_OPTS += --disable-session
endif
+ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
+MATCHBOX_DEPENDENCIES += xlib_libXcursor
+endif
+
$(eval $(autotools-package))