Move complex packages to their own menu

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1033 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 116 insertions, 64 deletions

diff --git a/package/howl/Config.in b/package/howl/Config.in
index 4311b0fc9..c4623ec60 100644
--- a/package/howl/Config.in
+++ b/package/howl/Config.in
@@ -1,34 +1,46 @@
+menu "howl - Zeroconf networking implementation"
+
 config BR2_PACKAGE_HOWL
-	bool "howl - Zeroconf networking implementation"
-	default y if CONFIG_DEVEL
+	bool
+	default n
+	depends BR2_PACKAGE_LIBHOWL
+
+config BR2_PACKAGE_LIBHOWL
+	prompt "libhowl - howl library"
+	tristate
+	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_HOWL
 	help
+	  
 	  A cross-platform implementation of Zeroconf networking.
 	  
 	  http://www.porchdogsoft.com/products/howl/
 	  
-
-config BR2_PACKAGE_LIBHOWL
-	depends BR2_PACKAGE_HOWL
-	tristate "libhowl - howl library"
-	default m if CONFIG_DEVEL
+	  This package contains shared libraries, needed by other programs.
+	  
 
 config BR2_PACKAGE_HOWL_UTILS
 	depends BR2_PACKAGE_LIBHOWL
-	tristate "howl-utils - howl client utilities"
+	prompt "howl-utils - howl client utilities"
+	tristate
 	default m if CONFIG_DEVEL
 
-config BR2_PACKAGE_MDNSRESPONDER
+config BR2_PACKAGE_AUTOIPD
 	depends BR2_PACKAGE_LIBHOWL
-	tristate "mdnsresponder - an mDNS (Multicast DNS) service responder daemon"
+	prompt "autoipd - an IPv4 Link-Local address self-assigner daemon"
+	tristate
 	default m if CONFIG_DEVEL
 
-config BR2_PACKAGE_AUTOIPD
+config BR2_PACKAGE_MDNSRESPONDER
 	depends BR2_PACKAGE_LIBHOWL
-	tristate "autoipd - an IPv4 Link-Local address self-assigner daemon"
+	prompt "mdnsresponder - an mDNS (Multicast DNS) service responder daemon"
+	tristate
 	default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_NIFD
 	depends BR2_PACKAGE_LIBHOWL
-	tristate "nifd - a network interface monitor daemon"
+	prompt "nifd - a network interface monitor daemon"
+	tristate
 	default m if CONFIG_DEVEL
 
+endmenu
diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in
index 38c4c72ce..fd423358a 100644
--- a/package/lighttpd/Config.in
+++ b/package/lighttpd/Config.in
@@ -1,7 +1,11 @@
+menu "lighttpd - Flexible and lightweight web server"
+
 config BR2_PACKAGE_LIGHTTPD
 	prompt "lighttpd - Flexible and lightweight web server"
 	tristate 
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_LIBOPENSSL
+	select BR2_PACKAGE_LIBPCRE
 	help
 	  A flexible and lightweight web server.
 	  
@@ -12,61 +16,62 @@ config BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_ALIAS
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-alias - Directory alias module"
+	prompt "...-mod-alias - Directory alias module"
 	tristate 
 	default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_LIGHTTPD_MOD_AUTH
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-auth - Authentication module"
+	prompt "...-mod-auth - Authentication module"
 	tristate 
 	default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_LIGHTTPD_MOD_CGI
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-cgi - CGI module"
+	prompt "...-mod-cgi - CGI module"
 	tristate 
 	default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_LIGHTTPD_MOD_PROXY
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-proxy - Proxy module"
+	prompt "...-mod-proxy - Proxy module"
 	tristate 
 	default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_LIGHTTPD_MOD_REDIRECT
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-redirect - URL redirection module"
+	prompt "...-mod-redirect - URL redirection module"
 	tristate 
 	default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_LIGHTTPD_MOD_REWRITE
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-rewrite - URL rewriting module"
+	prompt "...-mod-rewrite - URL rewriting module"
 	tristate 
 	default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_LIGHTTPD_MOD_SETENV
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-setenv - Environment variable setting module"
+	prompt "...-mod-setenv - Environment variable setting module"
 	tristate 
 	default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_LIGHTTPD_MOD_SIMPLE_VHOST
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-simple-vhost - Simple virtual hosting module"
+	prompt "...-mod-simple-vhost - Simple virtual hosting module"
 	tristate 
 	default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_LIGHTTPD_MOD_STATUS
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-status - Server status display module"
+	prompt "...-mod-status - Server status display module"
 	tristate 
 	default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_LIGHTTPD_MOD_USERTRACK
 	depends BR2_PACKAGE_LIGHTTPD
-	prompt "mod-usertrack - User tracking module"
+	prompt "...-mod-usertrack - User tracking module"
 	tristate 
 	default m if CONFIG_DEVEL
 
+endmenu
diff --git a/package/pmacct/Config.in b/package/pmacct/Config.in
index b4b2e4daa..af4868e0f 100644
--- a/package/pmacct/Config.in
+++ b/package/pmacct/Config.in
@@ -1,42 +1,65 @@
+menu "pmacct - IPv4/IPv6 accounting and aggregation tools"
+
 config BR2_PACKAGE_PMACCT
-	prompt "pmacct - IPv4/IPv6 accounting and aggregation tools"
 	bool
-	default m if CONFIG_DEVEL
-	help
-	  A small set of IPv4/IPv6 accounting and aggregation tools
-	  
-	  http://www.ba.cnr.it/~paolo/pmacct/
-	  
-	  Depends: libpcap
+	default n
+	select BR2_PACKAGE_LIBPCAP
+
+config BR2_PACKAGE_PMACCT_BASIC
+	bool
+	default n
+	depends BR2_PACKAGE_NFACCTD_BASIC || BR2_PACKAGE_PMACCTD_BASIC || BR2_PACKAGE_PMACCT_CLIENT
+	select BR2_PACKAGE_PMACCT
+
+config BR2_PACKAGE_PMACCT_MYSQL
+	bool
+	default n
+	depends BR2_PACKAGE_NFACCTD_MYSQL || BR2_PACKAGE_PMACCTD_MYSQL
+	select BR2_PACKAGE_PMACCT
+	select BR2_PACKAGE_LIBMYSQLCLIENT
+
+config BR2_PACKAGE_PMACCT_PGSQL
+	bool
+	default n
+	depends BR2_PACKAGE_NFACCTD_PGSQL || BR2_PACKAGE_PMACCTD_PGSQL
+	select BR2_PACKAGE_PMACCT
+	select BR2_PACKAGE_LIBPQ
 
 choice
 	prompt "nfacctd - NetFlow accounting daemon"
 	tristate
 	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_PMACCT
 	optional
+	help
+	  
+	  An IPv4/IPv6 Netflow accounting and aggregation daemon
+	  
+	  http://www.ba.cnr.it/~paolo/pmacct/
+	  
+	  Depends:
+	    - libmysqlclient (for MySQL database logging support)
+	    - libpq (for PostgreSQL database logging support)
+	  
 	
 	config BR2_PACKAGE_NFACCTD_BASIC
 		prompt "nfacctd: without database support"
 		tristate
-		select BR2_PACKAGE_LIBPCAP
+		select BR2_PACKAGE_PMACCT_BASIC
 	
 	config BR2_PACKAGE_NFACCTD_MYSQL
 		prompt "nfacctd-mysql: with MySQL database support"
 		tristate
-		select BR2_PACKAGE_LIBPCAP
-		select BR2_PACKAGE_LIBMYSQLCLIENT
+		select BR2_PACKAGE_PMACCT_MYSQL
 	
 	config BR2_PACKAGE_NFACCTD_PGSQL
 		prompt "nfacctd-pgsql: with PostgreSQL database support"
 		tristate
-		select BR2_PACKAGE_LIBPCAP
-		select BR2_PACKAGE_LIBPQ
+		select BR2_PACKAGE_PMACCT_PGSQL
 	
 	config BR2_PACKAGE_NFACCTD_CUSTOM
 		prompt "nfacctd-custom: customized to your needs"
 		tristate
-		select BR2_PACKAGE_LIBPCAP
+		select BR2_PACKAGE_PMACCT
 
 	config BR2_PACKAGE_NFACCTD_ENABLE_DEBUG
 		prompt "debug (enable debugging options, useful for bugreports)"
@@ -70,30 +93,39 @@ choice
 	prompt "pmacctd - IP accounting daemon (libpcap based)"
 	tristate
 	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_PMACCT
 	optional
+	help
+	  
+	  An IPv4/IPv6 libpcap-based accounting and aggregation daemon
+	  
+	  http://www.ba.cnr.it/~paolo/pmacct/
+	  
+	  Depends:
+	    - libpcap
+	    - libmysqlclient (for MySQL database logging support)
+	    - libpq (for PostgreSQL database logging support)
+	  
+	
 	
 	config BR2_PACKAGE_PMACCTD_BASIC
 		prompt "pmacctd: without database support"
 		tristate
-		select BR2_PACKAGE_LIBPCAP
+		select BR2_PACKAGE_PMACCT_BASIC
 
 	config BR2_PACKAGE_PMACCTD_MYSQL
 		prompt "pmacctd-mysql: with MySQL database support"
 		tristate
-		select BR2_PACKAGE_LIBPCAP
-		select BR2_PACKAGE_LIBMYSQLCLIENT
+		select BR2_PACKAGE_PMACCT_MYSQL
 	
 	config BR2_PACKAGE_PMACCTD_PGSQL
 		prompt "pmacctd-pgsql: with PostgreSQL database support"
 		tristate
-		select BR2_PACKAGE_LIBPCAP
-		select BR2_PACKAGE_LIBPQ
+		select BR2_PACKAGE_PMACCT_PGSQL
 	
 	config BR2_PACKAGE_PMACCTD_CUSTOM
 		prompt "pmacctd-custom: customized to your needs"
 		tristate
-		select BR2_PACKAGE_LIBPCAP
+		select BR2_PACKAGE_PMACCT
 	
 	config BR2_PACKAGE_PMACCTD_ENABLE_DEBUG
 		prompt "debug (enable debugging options, useful for bugreports)"
@@ -126,18 +158,7 @@ endchoice
 config BR2_PACKAGE_PMACCT_CLIENT
 	prompt "pmacct-client - Command-line client to gather data from the IMT plugin"
 	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_PMACCT
-
-config BR2_PACKAGE_PMACCT_BASIC
-	tristate
-	default BR2_PACKAGE_NFACCTD_BASIC || BR2_PACKAGE_PMACCTD_BASIC || BR2_PACKAGE_PMACCT_CLIENT
-
-config BR2_PACKAGE_PMACCT_MYSQL
-	tristate
-	default BR2_PACKAGE_NFACCTD_MYSQL || BR2_PACKAGE_PMACCTD_MYSQL
-
-config BR2_PACKAGE_PMACCT_PGSQL
-	tristate
-	default BR2_PACKAGE_NFACCTD_PGSQL || BR2_PACKAGE_PMACCTD_PGSQL
+	default n
+	select BR2_PACKAGE_PMACCT
 
+endmenu
diff --git a/package/snort/Config.in b/package/snort/Config.in
index ff79cfafd..d9e840f17 100644
--- a/package/snort/Config.in
+++ b/package/snort/Config.in
@@ -1,19 +1,32 @@
+menu "snort - Ligthweight Network Intrusion Detection System (NIDS)"
+
+config BR2_PACKAGE_SNORT
+	bool
+	default BR2_PACKAGE_SNORT_BASIC || BR2_PACKAGE_SNORT_MYSQL || BR2_PACKAGE_SNORT_PGSQL || BR2_PACKAGE_SNORT_CUSTOM
+	default n
+
 choice
 	prompt "snort - Ligthweight Network Intrusion Detection System (NIDS)"
 	tristate
 	optional
-	default m if CONFIG_DEVEL
 	help
+	  
 	  A ligthweight Network Intrusion Detection System (NIDS)
 	  
 	  http://www.snort.org/
 	  
-	  Depends: libnet, libpcap, libpcre
+	  Depends: 
+	    - libmysqlclient (for MySQL database logging support)
+	    - libnet
+	    - libpcap
+	    - libpcre
+	    - libpq (for PostgreSQL database logging support)
 	  
 	
 	config BR2_PACKAGE_SNORT_BASIC
 		prompt "snort: without database support"
 		tristate
+		select BR2_PACKAGE_SNORT
 		select BR2_PACKAGE_LIBNET
 		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBPCRE
@@ -21,6 +34,7 @@ choice
 	config BR2_PACKAGE_SNORT_MYSQL
 		prompt "snort-mysql: with MySQL database support"
 		tristate
+		select BR2_PACKAGE_SNORT
 		select BR2_PACKAGE_LIBNET
 		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBPCRE
@@ -29,6 +43,7 @@ choice
 	config BR2_PACKAGE_SNORT_PGSQL
 		prompt "snort-pgsql: with PostgreSQL database support"
 		tristate
+		select BR2_PACKAGE_SNORT
 		select BR2_PACKAGE_LIBNET
 		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBPCRE
@@ -37,6 +52,7 @@ choice
 	config BR2_PACKAGE_SNORT_CUSTOM
 		prompt "snort-custom: customized to your needs"
 		tristate
+		select BR2_PACKAGE_SNORT
 		select BR2_PACKAGE_LIBNET
 		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBPCRE
@@ -70,6 +86,4 @@ choice
 
 endchoice
 
-config BR2_PACKAGE_SNORT
-	tristate
-	default BR2_PACKAGE_SNORT_BASIC || BR2_PACKAGE_SNORT_MYSQL || BR2_PACKAGE_SNORT_PGSQL || BR2_PACKAGE_SNORT_CUSTOM
+endmenu