瀏覽代碼

package/lighttpd: reorder alphabetically options

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Fabrice Fontaine 3 年之前
父節點
當前提交
c2b90b9489
共有 2 個文件被更改,包括 34 次插入34 次删除
  1. 16 16
      package/lighttpd/Config.in
  2. 18 18
      package/lighttpd/lighttpd.mk

+ 16 - 16
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

+ 18 - 18
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