package/lighttpd: add more compile options

Added dbi, gnutls, libev, libunwind, mbedtls, nettle, and wolfssl.

Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>

package/lighttpd/Config.in

@@ -34,6 +34,23 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2
 	help
 	  Enable bzip2 support for lighttpd mod_deflate.
 
+config BR2_PACKAGE_LIGHTTPD_DBI
+	bool "dbi support"
+	select BR2_PACKAGE_LIBDBI
+	help
+	  Enable dbi support for lighttpd mod_auth mod_vhostdb_dbi.
+
+config BR2_PACKAGE_LIGHTTPD_GNUTLS
+	bool "gnutls support"
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_GNUTLS
+	help
+	  Enable gnutls support for lighttpd mod_auth.
+
+comment "gnutls support needs a toolchain w/ wchar, dynamic library"
+	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
+
 config BR2_PACKAGE_LIGHTTPD_KRB5
 	bool "krb5 support"
 	select BR2_PACKAGE_LIBKRB5
@@ -50,6 +67,12 @@ config BR2_PACKAGE_LIGHTTPD_LDAP
 comment "ldap support needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
 
+config BR2_PACKAGE_LIGHTTPD_LIBEV
+	bool "libev support"
+	select BR2_PACKAGE_LIBEV
+	help
+	  Enable libev support for lighttpd fdevent handlers.
+
 config BR2_PACKAGE_LIGHTTPD_LUA
 	bool "lua support"
 	depends on BR2_PACKAGE_LUA
@@ -62,6 +85,12 @@ config BR2_PACKAGE_LIGHTTPD_MAXMINDDB
 	help
 	  Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb
 
+config BR2_PACKAGE_LIGHTTPD_MBEDTLS
+	bool "mbedtls support"
+	select BR2_PACKAGE_MBEDTLS
+	help
+	  Enable mbedtls support for lighttpd mod_auth.
+
 config BR2_PACKAGE_LIGHTTPD_MYSQL
 	bool "mysql support"
 	depends on BR2_PACKAGE_MARIADB
@@ -71,6 +100,12 @@ config BR2_PACKAGE_LIGHTTPD_MYSQL
 comment "mysql support needs mariadb"
 	depends on !BR2_PACKAGE_MARIADB
 
+config BR2_PACKAGE_LIGHTTPD_NETTLE
+	bool "nettle support"
+	select BR2_PACKAGE_NETTLE
+	help
+	  Enable nettle support for lighttpd.
+
 config BR2_PACKAGE_LIGHTTPD_OPENSSL
 	bool "openssl support"
 	select BR2_PACKAGE_OPENSSL
@@ -116,6 +151,17 @@ config BR2_PACKAGE_LIGHTTPD_WEBDAV
 	help
 	  Enable webdav support. Needed to support mod_webdav
 
+config BR2_PACKAGE_LIGHTTPD_WOLFSSL
+	bool "wolfssl support"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_WOLFSSL
+	select BR2_PACKAGE_WOLFSSL_ALL
+	help
+	  Enable wolfssl support for lighttpd mod_auth.
+
+comment "wolfssl support needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_LIGHTTPD_ZLIB
 	bool "zlib support"
 	select BR2_PACKAGE_ZLIB

package/lighttpd/lighttpd.mk

@@ -13,17 +13,10 @@ LIGHTTPD_LICENSE_FILES = COPYING
 LIGHTTPD_CPE_ID_VENDOR = lighttpd
 LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash
 LIGHTTPD_CONF_OPTS = \
-	-Dwith_dbi=disabled \
 	-Dwith_fam=disabled \
-	-Dwith_gnutls=false \
-	-Dwith_libev=disabled \
-	-Dwith_libunwind=disabled \
-	-Dwith_mbedtls=false \
-	-Dwith_nettle=false \
 	-Dwith_nss=false \
 	-Dwith_pcre=disabled \
 	-Dwith_sasl=disabled \
-	-Dwith_wolfssl=false \
 	-Dwith_xattr=false \
 	-Dwith_xxhash=enabled \
 	-Dbuild_extra_warnings=false \
@@ -34,6 +27,13 @@ ifeq ($(BR2_PACKAGE_LIBXCRYPT),y)
 LIGHTTPD_DEPENDENCIES += libxcrypt
 endif
 
+ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
+LIGHTTPD_DEPENDENCIES += libunwind
+LIGHTTPD_CONF_OPTS += -Dwith_libunwind=enabled
+else
+LIGHTTPD_CONF_OPTS += -Dwith_libunwind=disabled
+endif
+
 ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y)
 LIGHTTPD_DEPENDENCIES += brotli
 LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled
@@ -48,6 +48,20 @@ else
 LIGHTTPD_CONF_OPTS += -Dwith_bzip=disabled
 endif
 
+ifeq ($(BR2_PACKAGE_LIGHTTPD_DBI),y)
+LIGHTTPD_DEPENDENCIES += libdbi
+LIGHTTPD_CONF_OPTS += -Dwith_dbi=enabled
+else
+LIGHTTPD_CONF_OPTS += -Dwith_dbi=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_LIGHTTPD_GNUTLS),y)
+LIGHTTPD_DEPENDENCIES += gnutls
+LIGHTTPD_CONF_OPTS += -Dwith_gnutls=true
+else
+LIGHTTPD_CONF_OPTS += -Dwith_gnutls=false
+endif
+
 ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y)
 LIGHTTPD_DEPENDENCIES += libkrb5
 LIGHTTPD_CONF_OPTS += -Dwith_krb5=enabled
@@ -62,6 +76,13 @@ else
 LIGHTTPD_CONF_OPTS += -Dwith_ldap=disabled
 endif
 
+ifeq ($(BR2_PACKAGE_LIGHTTPD_LIBEV),y)
+LIGHTTPD_DEPENDENCIES += libev
+LIGHTTPD_CONF_OPTS += -Dwith_libev=enabled
+else
+LIGHTTPD_CONF_OPTS += -Dwith_libev=disabled
+endif
+
 ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y)
 LIGHTTPD_DEPENDENCIES += lua
 LIGHTTPD_CONF_OPTS += -Dwith_lua=true
@@ -76,6 +97,13 @@ else
 LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled
 endif
 
+ifeq ($(BR2_PACKAGE_LIGHTTPD_MBEDTLS),y)
+LIGHTTPD_DEPENDENCIES += mbedtls
+LIGHTTPD_CONF_OPTS += -Dwith_mbedtls=true
+else
+LIGHTTPD_CONF_OPTS += -Dwith_mbedtls=false
+endif
+
 ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y)
 LIGHTTPD_DEPENDENCIES += mariadb
 LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled
@@ -83,6 +111,13 @@ else
 LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled
 endif
 
+ifeq ($(BR2_PACKAGE_LIGHTTPD_NETTLE),y)
+LIGHTTPD_DEPENDENCIES += nettle
+LIGHTTPD_CONF_OPTS += -Dwith_nettle=true
+else
+LIGHTTPD_CONF_OPTS += -Dwith_nettle=false
+endif
+
 ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y)
 LIGHTTPD_DEPENDENCIES += openssl
 LIGHTTPD_CONF_OPTS += -Dwith_openssl=true
@@ -124,6 +159,13 @@ else
 LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=disabled -Dwith_webdav_locks=disabled
 endif
 
+ifeq ($(BR2_PACKAGE_LIGHTTPD_WOLFSSL),y)
+LIGHTTPD_DEPENDENCIES += wolfssl
+LIGHTTPD_CONF_OPTS += -Dwith_wolfssl=true
+else
+LIGHTTPD_CONF_OPTS += -Dwith_wolfssl=false
+endif
+
 ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y)
 LIGHTTPD_DEPENDENCIES += zlib
 LIGHTTPD_CONF_OPTS += -Dwith_zlib=enabled