wget: bump to version 1.13.4 and improvements

* Bump wget to version 1.13.4
* Enable wget again on !wchar toolchains
* Enable support for gnutls

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/wget/Config.in b/package/wget/Config.in
index 172359c24aa803af1a9342a305bac46091b52117..3877a3af5b5547a3d9f57c405c7fadbd211255e0 100644 (file)
--- a/package/wget/Config.in
+++ b/package/wget/Config.in
@@ -1,10 +1,6 @@
 config BR2_PACKAGE_WGET
        bool "wget"
-       depends on BR2_USE_WCHAR
        help
          Network utility to retrieve files from http, https and ftp.
 
          http://www.gnu.org/software/wget/
-
-comment "wget requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR

diff --git a/package/wget/wget.mk b/package/wget/wget.mk
index c34a51c42b0c034eb964f8d88457931deeb9b20e..b14cd92bb37a88b047ebb9695b0d41b0a362eb1a 100644 (file)
--- a/package/wget/wget.mk
+++ b/package/wget/wget.mk
@@ -4,12 +4,30 @@
 #
 #############################################################
 
-WGET_VERSION = 1.12
+WGET_VERSION = 1.13.4
 WGET_SITE = $(BR2_GNU_MIRROR)/wget
 
+# Prefer full-blown wget over busybox
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+       WGET_DEPENDENCIES += busybox
+endif
+
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+       WGET_CONF_OPT += --with-ssl=gnutls \
+               --with-libgnutls-prefix=$(STAGING_DIR)
+       WGET_DEPENDENCIES += gnutls
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-       WGET_CONF_OPT += --with-ssl --with-libssl-prefix=$(STAGING_DIR)
+       WGET_CONF_OPT += --with-ssl=openssl --with-libssl-prefix=$(STAGING_DIR)
        WGET_DEPENDENCIES += openssl
 endif
 
+# --with-ssl is default
+ifneq ($(BR2_PACKAGE_GNUTLS),y)
+ifneq ($(BR2_PACKAGE_OPENSSL),y)
+       WGET_CONF_OPT += --without-ssl
+endif
+endif
+
 $(eval $(call AUTOTARGETS))