From: Ross Burton <ross.burton@intel.com>
Date: Thu, 7 Mar 2013 15:16:32 +0000 (+0000)
Subject: avahi: explicitly disable systemd if we don't want it enabled
X-Git-Tag: yocto-4.0~33634
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6126e7801542803aee1756aab41ba10a79bee092;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

avahi: explicitly disable systemd if we don't want it enabled

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 28e37b998a7..d8d9a9df878 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -56,7 +56,7 @@ EXTRA_OECONF = "--disable-introspection \
 
 # The distro choice determines what init scripts are installed
 EXTRA_OECONF_SYSVINIT = "${@base_contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
-EXTRA_OECONF_SYSTEMD = "${@base_contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','',d)}"
+EXTRA_OECONF_SYSTEMD = "${@base_contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
 
 AVAHI_GTK ?= "--disable-gtk --disable-gtk3"