summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2011-09-07 21:23:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-07 23:44:07 +0100
commitfa8dad209247b780590bc8476b5b16e6608d7907 (patch)
tree36b7076dd64b010eb26b20dbd1e86a9f7798aa17 /meta
parent848bb277769af5b094031aeb54d287c158256724 (diff)
downloadopenembedded-core-fa8dad209247b780590bc8476b5b16e6608d7907.tar.gz
openembedded-core-fa8dad209247b780590bc8476b5b16e6608d7907.tar.bz2
openembedded-core-fa8dad209247b780590bc8476b5b16e6608d7907.tar.xz
openembedded-core-fa8dad209247b780590bc8476b5b16e6608d7907.zip
avahi: only use gtk if DISTRO_FEATURES includes x11
Otherwise avahi isn't buildable for an x11-less DISTRO. Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index dc7a5aee6..24ea458e6 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,7 +14,8 @@ SECTION = "network"
# python scripts are under GPLv2+
LICENSE = "GPLv2+ & LGPLv2.1+"
-DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade"
+X11DEPENDS = "gtk+ libglade"
+DEPENDS = "expat libcap libdaemon dbus glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
file://00avahi-autoipd \
@@ -30,6 +31,7 @@ EXTRA_OECONF = "--with-distro=debian \
--disable-mono \
--disable-monodoc \
--disable-gtk3 \
+ ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-gtk', '--disable-gtk', d)} \
--disable-qt3 \
--disable-qt4 \
--disable-python \