add gcc4 fixes, remove the NEC FC20X2JA driver patch from lcd4linux temporary

[openwrt.git] / openwrt / package / mini_httpd / Config.in

diff --git a/openwrt/package/mini_httpd/Config.in b/openwrt/package/mini_httpd/Config.in
index 484924f..7b90881 100644 (file)
--- a/openwrt/package/mini_httpd/Config.in
+++ b/openwrt/package/mini_httpd/Config.in
@@ -1,11 +1,20 @@
+menu "mini-httpd........................ A small web server"
+
+config BR2_COMPILE_MINI_HTTPD
+       tristate
+       default n
+       depends BR2_PACKAGE_MINI_HTTPD || BR2_PACKAGE_MINI_HTTPD_MATRIXSSL || BR2_PACKAGE_MINI_HTTPD_OPENSSL
+
 config BR2_PACKAGE_MINI_HTTPD
-       tristate "mini-httpd - A small web server"
+       prompt "mini-httpd........................ A small web server"
+       tristate
        default m if CONFIG_DEVEL
+       select BR2_COMPILE_MINI_HTTPD
        help
-        mini_httpd is a small HTTP server. Its performance is not great, but for 
-        low or medium traffic sites it's quite adequate. It implements all the 
-        basic features of an HTTP server, including:
-        
+         mini_httpd is a small HTTP server. Its performance is not great, but for 
+         low or medium traffic sites it's quite adequate. It implements all the 
+         basic features of an HTTP server, including:
+         
             * GET, HEAD, and POST methods.
             * CGI.
             * Basic authentication.
@@ -17,8 +26,63 @@ config BR2_PACKAGE_MINI_HTTPD
             * Multihoming / virtual hosting.
             * Standard logging.
             * Custom error pages. 
-        
-        It can also be configured to do SSL/HTTPS and IPv6. 
-        
-        http://www.acme.com/software/mini_httpd/
-        
+         
+         It can also be configured to do IPv6. 
+         
+         http://www.acme.com/software/mini_httpd/
+
+config BR2_PACKAGE_MINI_HTTPD_MATRIXSSL
+       prompt "mini-httpd-matrixssl.............. A small web server, built with SSL support using MatrixSSL"
+       tristate
+       default m if CONFIG_DEVEL
+       select BR2_COMPILE_MINI_HTTPD
+       select BR2_PACKAGE_LIBMATRIXSSL
+       help
+         mini_httpd is a small HTTP server. Its performance is not great, but for 
+         low or medium traffic sites it's quite adequate. It implements all the 
+         basic features of an HTTP server, including:
+         
+            * GET, HEAD, and POST methods.
+            * CGI.
+            * Basic authentication.
+            * Security against ".." filename snooping.
+            * The common MIME types.
+            * Trailing-slash redirection.
+            * index.html, index.htm, index.cgi
+            * Directory listings.
+            * Multihoming / virtual hosting.
+            * Standard logging.
+            * Custom error pages. 
+         
+         It can also be configured to do SSL/HTTPS and IPv6. 
+         
+         http://www.acme.com/software/mini_httpd/
+
+config BR2_PACKAGE_MINI_HTTPD_OPENSSL
+       prompt "mini-httpd-openssl................ A small web server, built with SSL support using OpenSSL"
+       tristate
+       default m if CONFIG_DEVEL
+       select BR2_COMPILE_MINI_HTTPD
+       select BR2_PACKAGE_LIBOPENSSL
+       help
+         mini_httpd is a small HTTP server. Its performance is not great, but for 
+         low or medium traffic sites it's quite adequate. It implements all the 
+         basic features of an HTTP server, including:
+         
+            * GET, HEAD, and POST methods.
+            * CGI.
+            * Basic authentication.
+            * Security against ".." filename snooping.
+            * The common MIME types.
+            * Trailing-slash redirection.
+            * index.html, index.htm, index.cgi
+            * Directory listings.
+            * Multihoming / virtual hosting.
+            * Standard logging.
+            * Custom error pages. 
+         
+         It can also be configured to do SSL/HTTPS and IPv6. 
+         
+         http://www.acme.com/software/mini_httpd/
+
+endmenu