From 44092444554ab65c721cfdc35f3558dcafebb082 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Thu, 23 Jan 2014 15:00:02 +0100 Subject: [PATCH] libnftnl: add JSON and XML parsing support Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/libnftnl/Config.in | 16 ++++++++++++++++ package/libnftnl/libnftnl.mk | 14 ++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/package/libnftnl/Config.in b/package/libnftnl/Config.in index 66d051339d..75ca51910f 100644 --- a/package/libnftnl/Config.in +++ b/package/libnftnl/Config.in @@ -13,6 +13,22 @@ config BR2_PACKAGE_LIBNFTNL http://netfilter.org/projects/libnftnl/index.html +if BR2_PACKAGE_LIBNFTNL + +config BR2_PACKAGE_LIBNFTNL_JSON + bool "enable JSON support" + select BR2_PACKAGE_JANSSON + help + Enable JSON parsing support + +config BR2_PACKAGE_LIBNFTNL_XML + bool "enable XML support" + select BR2_PACKAGE_MXML + help + Enable XML parsing support + +endif + comment "libnftnl needs a toolchain w/ threads, IPv6, largefile" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || \ !BR2_LARGEFILE diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk index 5eba0aa800..0aecf1244b 100644 --- a/package/libnftnl/libnftnl.mk +++ b/package/libnftnl/libnftnl.mk @@ -12,4 +12,18 @@ LIBNFTNL_LICENSE_FILES = COPYING LIBNFTNL_INSTALL_STAGING = YES LIBNFTNL_DEPENDENCIES = host-pkgconf libmnl +ifeq ($(BR2_PACKAGE_LIBNFTNL_JSON),y) +LIBNFTNL_CONF_OPT += --with-json-parsing +LIBNFTNL_DEPENDENCIES += jansson +else +LIBNFTNL_CONF_OPT += --without-json-parsing +endif + +ifeq ($(BR2_PACKAGE_LIBNFTNL_XML),y) +LIBNFTNL_CONF_OPT += --with-xml-parsing +LIBNFTNL_DEPENDENCIES += mxml +else +LIBNFTNL_CONF_OPT += --without-xml-parsing +endif + $(eval $(autotools-package)) -- 2.30.2