From 7bb14206a25505cb70e78b1858a4d37a3e847b07 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 11 Aug 2014 09:12:26 -0700 Subject: dnsmasq: add packageconfigs for idn, conntrack, lua Signed-off-by: Christopher Larson Signed-off-by: Martin Jansa --- meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index 92c5367868..1335245986 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc @@ -18,10 +18,16 @@ inherit pkgconfig update-rc.d systemd INITSCRIPT_NAME = "dnsmasq" INITSCRIPT_PARAMS = "defaults" -PACKAGECONFIG ??= "" -PACKAGECONFIG[dbus] = "COPTS=-DHAVE_DBUS,,dbus" -EXTRA_OEMAKE = "${EXTRA_OECONF}" -EXTRA_OEMAKE += "\ +PACKAGECONFIG ?= "" +PACKAGECONFIG[dbus] = ",,dbus" +PACKAGECONFIG[idn] = ",,libidn" +PACKAGECONFIG[conntrack] = ",,libnetfilter-conntrack" +PACKAGECONFIG[lua] = ",,lua" +EXTRA_OEMAKE = "\ + 'COPTS=${@base_contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \ + ${@base_contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \ + ${@base_contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \ + ${@base_contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \ 'CFLAGS=${CFLAGS}' \ 'LDFLAGS=${LDFLAGS}' \ " -- cgit 1.2.3-korg