libsoup: add option to enable HTTPS (SSL) support

By selecting BR2_PACKAGE_LIBSOUP_SSL the gnutls package is selected
and libsoup will be compiled with SSL support.

[Peter: pass --with-libgcrypt-prefix so configure finds it]
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 2264b63ccecd505d0c57c2f23e68c87105f16248..347687cfef71f8c62e84ab7de8e73a257f438c4b 100644 (file)
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -12,5 +12,12 @@ config BR2_PACKAGE_LIBSOUP
 
          http://live.gnome.org/LibSoup
 
+config BR2_PACKAGE_LIBSOUP_SSL
+       bool "https support"
+       select BR2_PACKAGE_GNUTLS
+       depends on BR2_PACKAGE_LIBSOUP
+       help
+         Enable HTTPS (SSL) support.
+
 comment "libsoup requires a toolchain with WCHAR support"
        depends on !BR2_USE_WCHAR

diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 11bfadd852172c108a851e72c908904255632360..79a8d5509d6314caab72c10bb21a7c26d4c11c3e 100644 (file)
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -19,9 +19,15 @@ endif
 LIBSOUP_CONF_OPT = \
        --disable-explicit-deps \
        --disable-glibtest      \
-       --disable-ssl           \
        --without-gnome
 
 LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2
 
+ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
+LIBSOUP_DEPENDENCIES += gnutls
+LIBSOUP_CONF_OPT += --enable-ssl --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+else
+LIBSOUP_CONF_OPT += --disable-ssl
+endif
+
 $(eval $(call AUTOTARGETS,package,libsoup))