diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/libmicrohttpd/Config.in | 14 | ||||
-rw-r--r-- | package/libmicrohttpd/libmicrohttpd.mk | 5 |
2 files changed, 11 insertions, 8 deletions
diff --git a/package/libmicrohttpd/Config.in b/package/libmicrohttpd/Config.in index 2e4de0f6a..5c20ba602 100644 --- a/package/libmicrohttpd/Config.in +++ b/package/libmicrohttpd/Config.in @@ -8,13 +8,13 @@ config BR2_PACKAGE_LIBMICROHTTPD http://www.gnu.org/software/libmicrohttpd/ config BR2_PACKAGE_LIBMICROHTTPD_SSL - bool "https support" - depends on BR2_PACKAGE_LIBMICROHTTPD - depends on BR2_USE_WCHAR - select BR2_PACKAGE_GNUTLS - select BR2_PACKAGE_LIBGCRYPT - help - Enable HTTPS (SSL) support. + bool "https support" + depends on BR2_PACKAGE_LIBMICROHTTPD + depends on BR2_USE_WCHAR + select BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_LIBGCRYPT + help + Enable HTTPS (SSL) support. comment "libmicrohttpd needs a toolchain with thread support" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 697cbf50a..a38366749 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -6,13 +6,16 @@ LIBMICROHTTPD_VERSION = 0.9.27 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd +LIBMICROHTTPD_LICENSE_FILE = COPYING LIBMICROHTTPD_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) +LIBMICROHTTPD_LICENSE = LGPLv2.1+ LIBMICROHTTPD_DEPENDENCIES += gnutls libgcrypt LIBMICROHTTPD_CONF_OPT += --enable-https --with-gnutls=$(STAGING_DIR)/usr \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr + --with-libgcrypt-prefix=$(STAGING_DIR)/usr else +LIBMICROHTTPD_LICENSE = LGPLv2.1+ or eCos LIBMICROHTTPD_CONF_OPT += --disable-https endif |