diff options
| author | Carsten Schoenert <c.schoenert@gmail.com> | 2013-06-26 20:49:40 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-06-27 10:32:31 +0200 |
| commit | 4e6093b60ed7794b53e8e60ccba62c0345e6303a (patch) | |
| tree | 5e1c32211f640d10618c7f0c4ebd3fab7fb4ea55 | |
| parent | 584f418ec1ae3f0b5e09c10133c82578d78a3e03 (diff) | |
| download | buildroot-novena-4e6093b60ed7794b53e8e60ccba62c0345e6303a.tar.gz buildroot-novena-4e6093b60ed7794b53e8e60ccba62c0345e6303a.zip | |
package/libmicrohttpd: minor fixes and additions
Correcting the indentation inside Config.in. Also adding the missed
license information.
Note: libmicrohttpd is partialy dual licensed, if you don't need or want
to use the HTTPS option you can choose between LPGLv2.1+ and the eCos
license (http://ecos.sourceware.org/license-overview.html).
If you use the HTTPS option you have to agree to the LGPLv2.1+!
Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -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 |