Browse Source

libmicrohttpd: bump to version 0.9.24

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Gustavo Zacarias 12 years ago
parent
commit
562d1ad82e
2 changed files with 9 additions and 4 deletions
  1. 5 0
      package/libmicrohttpd/Config.in
  2. 4 4
      package/libmicrohttpd/libmicrohttpd.mk

+ 5 - 0
package/libmicrohttpd/Config.in

@@ -1,5 +1,6 @@
 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.
@@ -9,6 +10,10 @@ config BR2_PACKAGE_LIBMICROHTTPD
 config BR2_PACKAGE_LIBMICROHTTPD_SSL
        bool "https support"
        depends on BR2_PACKAGE_LIBMICROHTTPD
+       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

+ 4 - 4
package/libmicrohttpd/libmicrohttpd.mk

@@ -3,14 +3,14 @@
 # libmicrohttpd
 #
 #############################################################
-LIBMICROHTTPD_VERSION = 0.4.6
-LIBMICROHTTPD_SOURCE = libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz
+
+LIBMICROHTTPD_VERSION = 0.9.24
 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
 LIBMICROHTTPD_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)
-LIBMICROHTTPD_DEPENDENCIES += libgcrypt
-LIBMICROHTTPD_CONF_OPT += --enable-https \
+LIBMICROHTTPD_DEPENDENCIES += gnutls libgcrypt
+LIBMICROHTTPD_CONF_OPT += --enable-https --with-gnutls=$(STAGING_DIR)/usr \
 			  --with-libgcrypt-prefix=$(STAGING_DIR)/usr
 else
 LIBMICROHTTPD_CONF_OPT += --disable-https