diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-02-19 23:37:40 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-02-19 23:48:48 +0100 |
| commit | 7ee387f43b8daa8e749472a9b1153941a44e688e (patch) | |
| tree | 2542546e05d8ca25868cabc12056a57629611221 | |
| parent | cbd5099271121f544a23a07c974f33d366591247 (diff) | |
libmicrohttpd: make https support optional
Libmicrohttpd works nicely without https support, so make it optional.
Also ensure the cross-libgcrypt-config is found, rather than whatever
is installed on the host.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/libmicrohttpd/Config.in | 8 | ||||
| -rw-r--r-- | package/libmicrohttpd/libmicrohttpd.mk | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/package/libmicrohttpd/Config.in b/package/libmicrohttpd/Config.in index de656ad38..cfedc8fa9 100644 --- a/package/libmicrohttpd/Config.in +++ b/package/libmicrohttpd/Config.in @@ -1,8 +1,14 @@ config BR2_PACKAGE_LIBMICROHTTPD bool "libmicrohttpd" - select BR2_PACKAGE_LIBGCRYPT 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/ + +config BR2_PACKAGE_LIBMICROHTTPD_SSL + bool "https support" + depends on BR2_PACKAGE_LIBMICROHTTPD + select BR2_PACKAGE_LIBGCRYPT + help + Enable HTTPS (SSL) support. diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 8273d90e1..626c0469f 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -8,6 +8,12 @@ LIBMICROHTTPD_SOURCE:=libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz LIBMICROHTTPD_SITE:=$(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_INSTALL_STAGING = YES -LIBMICROHTTPD_DEPENDENCIES = libgcrypt +ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) +LIBMICROHTTPD_DEPENDENCIES += libgcrypt +LIBMICROHTTPD_CONF_OPT += --enable-https \ + --with-libgcrypt-prefix=$(STAGING_DIR)/usr +else +LIBMICROHTTPD_CONF_OPT += --disable-https +endif $(eval $(call AUTOTARGETS,package,libmicrohttpd)) |