aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2015-06-03 22:41:40 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-06-09 23:06:29 +0200
commit14b6ea282fe85e41f1ae7a37c687440f1bcf1642 (patch)
treeb43a89e5c97455837379fd2c203e9b69b228d37d
parentb2a7ad665d90ad76ff64c064c27bcb1d7d368d22 (diff)
downloadbuildroot-14b6ea282fe85e41f1ae7a37c687440f1bcf1642.tar.gz
buildroot-14b6ea282fe85e41f1ae7a37c687440f1bcf1642.tar.bz2
package/matchbox: enable support for the Xsession manager
Since this is a non-obvious dependency, just select the appropriate library. Also, add a comment to act as a separator between matchbox' options and the other matchbox packages. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/matchbox/Config.in8
-rw-r--r--package/matchbox/matchbox.mk7
2 files changed, 15 insertions, 0 deletions
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index ae33ecfc2c..d42b90fbf7 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -17,6 +17,14 @@ menuconfig BR2_PACKAGE_MATCHBOX
if BR2_PACKAGE_MATCHBOX
+config BR2_PACKAGE_MATCHBOX_SM
+ bool "session manager"
+ select BR2_PACKAGE_XLIB_LIBSM
+ help
+ Enable support for the Session Manager.
+
+comment "matchbox utilities"
+
source "package/matchbox-common/Config.in"
source "package/matchbox-desktop/Config.in"
source "package/matchbox-fakekey/Config.in"
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index 43f6b4b1df..b1f96a6e5a 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -27,4 +27,11 @@ else
MATCHBOX_CONF_OPTS += --disable-startup-notification
endif
+ifeq ($(BR2_PACKAGE_MATCHBOX_SM),y)
+MATCHBOX_CONF_OPTS += --enable-session
+MATCHBOX_DEPENDENCIES += xlib_libSM
+else
+MATCHBOX_CONF_OPTS += --disable-session
+endif
+
$(eval $(autotools-package))