package/libmicrohttpd: minor fixes and additions

From: Carsten Schoenert <[email protected]>

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+!

---
Changes in v3:
- change implementation of the licenses and correct LGPLv2.1+ version as Arnout argumented

Changes in v2:
- reworking 'Config.in' after suggestions from Thomas Petazzoni
- fixed LIBDVBSI_SITE for correct download URL mentioned by Yann Morin

 package/libmicrohttpd/Config.in        |   14 +++++++-------
 package/libmicrohttpd/libmicrohttpd.mk |    5 ++++-
 2 files changed, 11 insertions(+), 8 deletions(-)

index 2e4de0f..5c20ba6 100644
@@ -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

index 697cbf5..066074a 100644
@@ -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
 

1.7.10.4

h
Carsten> From: Carsten Schoenert <[email protected]> Carsten> Correcting the indentation inside Config.in. Also adding the missed Carsten> license information.

Carsten> Note: libmicrohttpd is partialy dual licensed, if you don't need or want Carsten> to use the HTTPS option you can choose between LPGLv2.1+ and the eCos Carsten> license (http://ecos.sourceware.org/license-overview.html).
Carsten> If you use the HTTPS option you have to agree to the LGPLv2.1+!

Carsten> --- a/package/libmicrohttpd/libmicrohttpd.mk Carsten> +++ b/package/libmicrohttpd/libmicrohttpd.mk Carsten> @@ -6,13 +6,16 @@

Carsten> LIBMICROHTTPD_VERSION = 0.9.27
Carsten> LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd Carsten> +LIBMICROHTTPD_LICENSE_FILE = COPYING Carsten> LIBMICROHTTPD_INSTALL_STAGING = YES

Carsten> ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)
Carsten> +LIBMICROHTTPD_LICENSE = LGPLv2.1+
Carsten> LIBMICROHTTPD_DEPENDENCIES += gnutls libgcrypt
Carsten> LIBMICROHTTPD_CONF_OPT += --enable-https --with-gnutls=$(STAGING_DIR)/usr \
Carsten> - --with-libgcrypt-prefix=$(STAGING_DIR)/usr
Carsten> + --with-libgcrypt-prefix=$(STAGING_DIR)/usr

No need to indent this far. Other than that it looks good - Committed, thanks.

Bye, Peter Korsgaard