diff options
| author | Sven Neumann <s.neumann@raumfeld.com> | 2011-08-11 11:57:41 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-09-06 12:06:14 +0200 |
| commit | bd387486ad871164e4fbe86eb6570775086acfbe (patch) | |
| tree | 0121b417e197c682f1dc2ed8d6d15e5e7e103d29 /package | |
| parent | 044edd0637f3d8dfde318ecd1fc10a6fb6422fa0 (diff) | |
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>
Diffstat (limited to 'package')
| -rw-r--r-- | package/libsoup/Config.in | 7 | ||||
| -rw-r--r-- | package/libsoup/libsoup.mk | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in index 2264b63cc..347687cfe 100644 --- 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 11bfadd85..79a8d5509 100644 --- 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)) |