summaryrefslogtreecommitdiff
path: root/meta/recipes-core/dbus
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2011-08-12 16:59:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-15 15:13:34 +0100
commitabf2ab7b4d6e9f615f86ba84e684ae0753c602a8 (patch)
tree42cbcdf81fd9d265c0db187d9b2d42deeb468bfa /meta/recipes-core/dbus
parentba22cfac56120d001a53d33aee3b8eb3feda2786 (diff)
downloadopenembedded-core-abf2ab7b4d6e9f615f86ba84e684ae0753c602a8.tar.gz
openembedded-core-abf2ab7b4d6e9f615f86ba84e684ae0753c602a8.tar.bz2
openembedded-core-abf2ab7b4d6e9f615f86ba84e684ae0753c602a8.zip
dbus: only use x11 if DISTRO_FEATURES has selected it
This makes it possible to include dbus in a non-X11-equipped DISTRO. Signed-off-by: Phil Blundell <philb@gnu.org>
Diffstat (limited to 'meta/recipes-core/dbus')
-rw-r--r--meta/recipes-core/dbus/dbus.inc7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 6b76cba959..a8ecda8d4f 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -5,7 +5,8 @@ SECTION = "base"
LICENSE = "AFL-2 | GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5"
-DEPENDS = "expat virtual/libintl virtual/libx11 libsm"
+X11DEPENDS = "virtual/libx11 libsm"
+DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
DEPENDS_virtclass-native = "expat-native virtual/libintl-native"
DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11"
@@ -22,7 +23,7 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session
DEBIANNAME_${PN} = "dbus-1"
-PACKAGES =+ "${PN}-lib ${PN}-x11 ${PN}-systemd"
+PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11', '${PN}-x11', '', d)}"
FILES_${PN}-x11 = "${bindir}/dbus-launch"
RDEPENDS_${PN}-x11 = "${PN}"
@@ -73,7 +74,7 @@ pkg_postinst_dbus() {
fi
}
-EXTRA_OECONF_X = "--with-x"
+EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
EXTRA_OECONF_X_virtclass-native = "--without-x"
EXTRA_OECONF = "--disable-tests \