Merge from bittboy/buildroot@db180c0

package/libmicrohttpd/Config.in

@@ -0,0 +1,26 @@
+config BR2_PACKAGE_LIBMICROHTTPD
+	bool "libmicrohttpd"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  GNU libmicrohttpd is a small C library that makes it easy to
+	  run an HTTP server as part of another application.
+
+	  http://www.gnu.org/software/libmicrohttpd/
+
+if BR2_PACKAGE_LIBMICROHTTPD
+
+config BR2_PACKAGE_LIBMICROHTTPD_SSL
+	bool "https support"
+	depends on !BR2_STATIC_LIBS # gnutls
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_GNUTLS
+	help
+	  Enable HTTPS (SSL) support.
+
+comment "libmicrohttpd https support needs a toolchain w/ wchar, dynamic library"
+	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
+
+endif
+
+comment "libmicrohttpd needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

package/libmicrohttpd/libmicrohttpd.hash

@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 4e66d4db1574f4912fbd2690d10d227cc9cc56df6a10aa8f4fc2da75cea7ab1b  libmicrohttpd-0.9.66.tar.gz
+sha256 7399547209438c93f9b90297954698773d4846cea44cde5ca982c84c45952a3b  COPYING

package/libmicrohttpd/libmicrohttpd.mk

@@ -0,0 +1,25 @@
+################################################################################
+#
+# libmicrohttpd
+#
+################################################################################
+
+LIBMICROHTTPD_VERSION = 0.9.66
+LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
+LIBMICROHTTPD_LICENSE_FILES = COPYING
+LIBMICROHTTPD_INSTALL_STAGING = YES
+LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples
+LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99
+
+LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)"
+
+ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)
+LIBMICROHTTPD_LICENSE = LGPL-2.1+
+LIBMICROHTTPD_DEPENDENCIES += host-pkgconf gnutls
+LIBMICROHTTPD_CONF_OPTS += --enable-https --with-gnutls=$(STAGING_DIR)/usr
+else
+LIBMICROHTTPD_LICENSE = LGPL-2.1+ or eCos
+LIBMICROHTTPD_CONF_OPTS += --disable-https
+endif
+
+$(eval $(autotools-package))