aboutsummaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2014-08-11 09:12:26 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2014-08-13 23:28:04 +0200
commit7bb14206a25505cb70e78b1858a4d37a3e847b07 (patch)
tree882baf15b2c25deeffe71e57fdd191dcfd3914c8 /meta-networking
parentf1e112fa688aa0900ebdbcc31d88c6ce91251495 (diff)
downloadmeta-openembedded-contrib-7bb14206a25505cb70e78b1858a4d37a3e847b07.tar.gz
meta-openembedded-contrib-7bb14206a25505cb70e78b1858a4d37a3e847b07.tar.bz2
meta-openembedded-contrib-7bb14206a25505cb70e78b1858a4d37a3e847b07.zip
dnsmasq: add packageconfigs for idn, conntrack, lua
Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-support/dnsmasq/dnsmasq.inc14
1 files 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}' \
"