From 8f46b79c20495ece0256ac2637062a6476944619 Mon Sep 17 00:00:00 2001 From: Glenn Strauss Date: Thu, 17 Dec 2020 05:15:43 -0500 Subject: [PATCH] lighttpd: cleaner TLS dependency logic in Makefile incorporate suggestion from cotequeiroz (Eneas U de Queiroz) https://github.com/openwrt/packages/issues/14142#issuecomment-739583111 Signed-off-by: Glenn Strauss --- net/lighttpd/Makefile | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile index a96215c22d..ea7283b8ee 100644 --- a/net/lighttpd/Makefile +++ b/net/lighttpd/Makefile @@ -57,6 +57,17 @@ config LIGHTTPD_SSL your lighttpd configuration file. (mod_gnutls, mod_mbedtls, mod_nss, mod_openssl, mod_wolfssl) +config LIGHTTPD_SSL_DEPENDS + bool + depends on LIGHTTPD_SSL + default PACKAGE_lighttpd-mod-mbedtls || PACKAGE_lighttpd-mod-wolfssl || PACKAGE_lighttpd-mod-gnutls || PACKAGE_lighttpd-mod-nss + +config LIGHTTPD_SSL_SELECT + tristate + depends on LIGHTTPD_SSL + default m if !LIGHTTPD_SSL_DEPENDS + select PACKAGE_lighttpd-mod-openssl + config LIGHTTPD_LOGROTATE bool "Logrotate support" depends on PACKAGE_lighttpd @@ -65,26 +76,6 @@ config LIGHTTPD_LOGROTATE It adds support for logrotate functionality. endef -ifneq ($(strip $(CONFIG_LIGHTTPD_SSL)),) - ifeq ($(CONFIG_PACKAGE_lighttpd-mod-openssl),) - ifeq ($(CONFIG_PACKAGE_lighttpd-mod-mbedtls),) - ifeq ($(CONFIG_PACKAGE_lighttpd-mod-wolfssl),) - ifeq ($(CONFIG_PACKAGE_lighttpd-mod-gnutls),) - ifeq ($(CONFIG_PACKAGE_lighttpd-mod-nss),) - CONFIG_PACKAGE_lighttpd-mod-openssl=m - endif - endif - endif - endif - endif -endif - -ifneq ($(CONFIG_PACKAGE_lighttpd-mod-auth),) - ifeq ($(CONFIG_PACKAGE_lighttpd-mod-authn_file),) - CONFIG_PACKAGE_lighttpd-mod-authn_file=m - endif -endif - MESON_ARGS += \ -Dwith_brotli=false \ -Dwith_bzip=false \ -- 2.30.2