jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 13:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/libmicrohttpd: minor fixes and additions

Browse Source 
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>
This commit is contained in:
Carsten Schoenert 2013-06-26 20:49:40 +02:00 committed by Peter Korsgaard
parent 584f418ec1
commit 4e6093b60e
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/libmicrohttpd/Config.in
View File

@ -8,13 +8,13 @@ config BR2_PACKAGE_LIBMICROHTTPD
http://www.gnu.org/software/libmicrohttpd/ http://www.gnu.org/software/libmicrohttpd/
config BR2_PACKAGE_LIBMICROHTTPD_SSL config BR2_PACKAGE_LIBMICROHTTPD_SSL
bool "https support" bool "https support"
depends on BR2_PACKAGE_LIBMICROHTTPD depends on BR2_PACKAGE_LIBMICROHTTPD
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
select BR2_PACKAGE_GNUTLS select BR2_PACKAGE_GNUTLS
select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGCRYPT
help help
Enable HTTPS (SSL) support. Enable HTTPS (SSL) support.
comment "libmicrohttpd needs a toolchain with thread support" comment "libmicrohttpd needs a toolchain with thread support"
depends on !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_THREADS

5
package/libmicrohttpd/libmicrohttpd.mk
View File

@ -6,13 +6,16 @@
LIBMICROHTTPD_VERSION = 0.9.27 LIBMICROHTTPD_VERSION = 0.9.27
LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
LIBMICROHTTPD_LICENSE_FILE = COPYING
LIBMICROHTTPD_INSTALL_STAGING = YES LIBMICROHTTPD_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)
LIBMICROHTTPD_LICENSE = LGPLv2.1+
LIBMICROHTTPD_DEPENDENCIES += gnutls libgcrypt LIBMICROHTTPD_DEPENDENCIES += gnutls libgcrypt
LIBMICROHTTPD_CONF_OPT += --enable-https --with-gnutls=$(STAGING_DIR)/usr \ LIBMICROHTTPD_CONF_OPT += --enable-https --with-gnutls=$(STAGING_DIR)/usr \
--with-libgcrypt-prefix=$(STAGING_DIR)/usr --with-libgcrypt-prefix=$(STAGING_DIR)/usr
else else
LIBMICROHTTPD_LICENSE = LGPLv2.1+ or eCos
LIBMICROHTTPD_CONF_OPT += --disable-https LIBMICROHTTPD_CONF_OPT += --disable-https
endif endif