aria2: Add xml library choice

Signed-off-by: Hsing-Wang Liao <kuoruan@gmail.com>

diff --git a/net/aria2/Config.in b/net/aria2/Config.in
index ec21fafe7dab98d5a081308ec3669b95f3e07bc4..0700188c4c982d1386d5552354981515f2b4e155 100644 (file)
--- a/net/aria2/Config.in
+++ b/net/aria2/Config.in
@@ -25,4 +25,17 @@ config ARIA2_METALINK
        bool "Enable metalink support"
        default N
 
+choice
+       prompt "XML library"
+       default ARIA2_EXPAT
+       depends on ARIA2_METALINK
+
+config ARIA2_EXPAT
+       bool "EXPAT"
+
+config ARIA2_LIBXML2
+       bool "LIBXML2"
+
+endchoice
+
 endmenu

diff --git a/net/aria2/Makefile b/net/aria2/Makefile
index 9ff498249340285d34f7a1cf1f0a95fb8585eba2..5ebdd224236a2316edfc43c60f776d156237ec1d 100644 (file)
--- a/net/aria2/Makefile
+++ b/net/aria2/Makefile
@@ -24,7 +24,9 @@ PKG_CONFIG_DEPENDS := \
   ARIA2_OPENSSL \
   ARIA2_GNUTLS \
   ARIA2_BITTORRENT \
-  ARIA2_METALINK
+  ARIA2_METALINK \
+  ARIA2_EXPAT \
+  ARIA2_LIBXML2
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -38,7 +40,7 @@ define Package/aria2
   SUBMENU:=File Transfer
   TITLE:=lightweight download utility
   URL:=http://aria2.sourceforge.net/
-  DEPENDS:=+zlib +ARIA2_METALINK:libxml2 +libstdcpp +ARIA2_OPENSSL:libopenssl +ARIA2_GNUTLS:libgnutls
+  DEPENDS:=+zlib +ARIA2_LIBXML2:libxml2 +ARIA2_EXPAT:libexpat +libstdcpp +ARIA2_OPENSSL:libopenssl +ARIA2_GNUTLS:libgnutls
 endef
 
 define Package/aria2/description
@@ -53,11 +55,11 @@ CONFIGURE_ARGS += \
        $(if $(CONFIG_ARIA2_GNUTLS),--with,--without)-gnutls \
        $(if $(CONFIG_ARIA2_BITTORRENT),--enable,--disable)-bittorrent \
        $(if $(CONFIG_ARIA2_METALINK),--enable,--disable)-metalink \
-       $(if $(CONFIG_ARIA2_METALINK),--with,--without)-libxml2 \
+       $(if $(CONFIG_ARIA2_LIBXML2),--with,--without)-libxml2 \
+       $(if $(CONFIG_ARIA2_EXPAT),--with,--without)-libexpat \
        --without-libnettle \
        --without-libgmp \
        --without-libgcrypt \
-       --without-libexpat \
        --without-libcares \
        --without-sqlite3 \
        --with-libz