From c2b90b94894366fa81eac0767a0f4ad42289cd6a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 23 Jan 2022 10:59:52 +0100 Subject: [PATCH] package/lighttpd: reorder alphabetically options Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lighttpd/Config.in | 32 ++++++++++++++++---------------- package/lighttpd/lighttpd.mk | 36 ++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 99a09e9766..59c1e0b2a6 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -21,6 +21,18 @@ config BR2_PACKAGE_LIGHTTPD if BR2_PACKAGE_LIGHTTPD +config BR2_PACKAGE_LIGHTTPD_BZIP2 + bool "bzip2 support" + select BR2_PACKAGE_BZIP2 + help + Enable bzip2 support for lighttpd mod_deflate. + +config BR2_PACKAGE_LIGHTTPD_LUA + bool "lua support" + depends on BR2_PACKAGE_LUA + help + Enable Lua support. Needed to support mod_magnet + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL @@ -34,18 +46,6 @@ config BR2_PACKAGE_LIGHTTPD_PAM help Enable PAM authentication support for lighttpd. -config BR2_PACKAGE_LIGHTTPD_ZLIB - bool "zlib support" - select BR2_PACKAGE_ZLIB - help - Enable zlib support for lighttpd mod_deflate. - -config BR2_PACKAGE_LIGHTTPD_BZIP2 - bool "bzip2 support" - select BR2_PACKAGE_BZIP2 - help - Enable bzip2 support for lighttpd mod_deflate. - config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" select BR2_PACKAGE_PCRE2 @@ -59,10 +59,10 @@ config BR2_PACKAGE_LIGHTTPD_WEBDAV help Enable webdav support. Needed to support mod_webdav -config BR2_PACKAGE_LIGHTTPD_LUA - bool "lua support" - depends on BR2_PACKAGE_LUA +config BR2_PACKAGE_LIGHTTPD_ZLIB + bool "zlib support" + select BR2_PACKAGE_ZLIB help - Enable Lua support. Needed to support mod_magnet + Enable zlib support for lighttpd mod_deflate. endif diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 2a05071209..bdbf75191c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -37,6 +37,20 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) +LIGHTTPD_DEPENDENCIES += bzip2 +LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +else +LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +endif + +ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) +LIGHTTPD_DEPENDENCIES += lua +LIGHTTPD_CONF_OPTS += -Dwith_lua=true +else +LIGHTTPD_CONF_OPTS += -Dwith_lua=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true @@ -51,20 +65,6 @@ else LIGHTTPD_CONF_OPTS += -Dwith_pam=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) -LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true -else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false -endif - -ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) -LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true -else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false -endif - ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) LIGHTTPD_DEPENDENCIES += pcre2 LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true @@ -85,11 +85,11 @@ else LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) -LIGHTTPD_DEPENDENCIES += lua -LIGHTTPD_CONF_OPTS += -Dwith_lua=true +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) +LIGHTTPD_DEPENDENCIES += zlib +LIGHTTPD_CONF_OPTS += -Dwith_zlib=true else -LIGHTTPD_CONF_OPTS += -Dwith_lua=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif define LIGHTTPD_INSTALL_CONFIG