From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Sat, 5 Jul 2008 08:20:34 +0000 (-0000)
Subject: [0002974] add support for zlib and bzip2 in lighttpd, use alphabetical order for... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e156f34a4a5bb828f2309ece2af95750a98f9d0e;p=buildroot.git

[0002974] add support for zlib and bzip2 in lighttpd, use alphabetical order for lighttpd config
---

diff --git a/package/Config.in b/package/Config.in
index d4d86020a0..c953493faf 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -173,6 +173,9 @@ source "package/libcgicc/Config.in"
 source "package/libeXosip2/Config.in"
 source "package/libosip2/Config.in"
 source "package/libpcap/Config.in"
+if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+source "package/lighttpd/Config.in"
+endif
 source "package/links/Config.in"
 source "package/lrzsz/Config.in"
 source "package/mdnsresponder/Config.in"
@@ -213,7 +216,6 @@ source "package/stunnel/Config.in"
 source "package/tcpdump/Config.in"
 source "package/tftpd/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-source "package/lighttpd/Config.in"
 source "package/thttpd/Config.in"
 source "package/tinyhttpd/Config.in"
 endif
diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in
index 7db9b2d3e5..7967022a31 100644
--- a/package/lighttpd/Config.in
+++ b/package/lighttpd/Config.in
@@ -16,13 +16,29 @@ if BR2_PACKAGE_LIGHTTPD
 menu "lighttpd packages"
 
 config BR2_PACKAGE_LIGHTTPD_OPENSSL
-	bool "openssl"
+	bool "lighttpd openssl support"
 	default y
 	depends on BR2_PACKAGE_LIGHTTPD
 	select BR2_PACKAGE_OPENSSL
 	help
 	  Enable OpenSSL support for lighttpd.
 
+config BR2_PACKAGE_LIGHTTPD_ZLIB
+	bool "lighttpd zlib support"
+	default n
+	depends on BR2_PACKAGE_LIGHTTPD
+	select BR2_PACKAGE_ZLIB
+	help
+	  Enable zlib support for lighttpd mod_compress.
+
+config BR2_PACKAGE_LIGHTTPD_BZIP2
+	bool "lighttpd bzip2 support"
+	default n
+	depends on BR2_PACKAGE_LIGHTTPD
+	select BR2_PACKAGE_BZIP2
+	help
+	  Enable bzip2 support for lighttpd mod_compress.
+
 config BR2_PACKAGE_LIGHTTPD_PCRE
 	bool "pcre"
 	default n
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index a41d9c98e7..131e87e720 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -30,6 +30,20 @@ else
 LIGHTTPD_CONF_OPT += --without-openssl
 endif
 
+ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_ZLIB)),y)
+LIGHTTPD_DEPENDENCIES += zlib
+LIGHTTPD_CONF_OPT += --with-zlib
+else
+LIGHTTPD_CONF_OPT += --without-zlib
+endif
+
+ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_BZIP2)),y)
+LIGHTTPD_DEPENDENCIES += bzip2
+LIGHTTPD_CONF_OPT += --with-bzip2
+else
+LIGHTTPD_CONF_OPT += --without-bzip2
+endif
+
 ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_PCRE)),y)
 LIGHTTPD_CONF_ENV += PCRE_LIB="-lpcre"
 LIGHTTPD_DEPENDENCIES += pcre