X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/b418a072de49818898dc7c0226f5da285e5c3be9..b0b75e654e3f389d9900e2846cf2bf2adf24e7fe:/openwrt/package/pmacct/Config.in

diff --git a/openwrt/package/pmacct/Config.in b/openwrt/package/pmacct/Config.in
index fb88a073b..297638611 100644
--- a/openwrt/package/pmacct/Config.in
+++ b/openwrt/package/pmacct/Config.in
@@ -1,62 +1,95 @@
-config BR2_PACKAGE_PMACCT
-	prompt "pmacct - a set of IPv4/IPv6 accounting and aggregation tools"
-	bool
-	default y if CONFIG_DEVEL
-	select BR2_PACKAGE_LIBPCAP
-	help
-	  A small set of IPv4/IPv6 accounting and aggregation tools
-	  
-	  http://www.ba.cnr.it/~paolo/pmacct/
-	  
-	  Depends: libpcap
+menu "pmacct............................ IPv4/IPv6 accounting and aggregation tools"
+
+config BR2_COMPILE_PMACCT
+	tristate
+	default n
+	depends BR2_COMPILE_PMACCT_BASIC || BR2_COMPILE_PMACCT_MYSQL || BR2_COMPILE_PMACCT_PGSQL || BR2_COMPILE_PMACCT_CUSTOM
+
+config BR2_COMPILE_PMACCT_BASIC
+	tristate
+	default n
+	depends BR2_PACKAGE_NFACCTD_BASIC || BR2_PACKAGE_PMACCTD_BASIC
+	select BR2_COMPILE_PMACCT
+
+config BR2_COMPILE_PMACCT_MYSQL
+	tristate
+	default n
+	depends BR2_PACKAGE_NFACCTD_MYSQL || BR2_PACKAGE_PMACCTD_MYSQL
+	select BR2_COMPILE_PMACCT
+
+config BR2_COMPILE_PMACCT_PGSQL
+	tristate
+	default n
+	depends BR2_PACKAGE_NFACCTD_PGSQL || BR2_PACKAGE_PMACCTD_PGSQL
+	select BR2_COMPILE_PMACCT
+
+config BR2_COMPILE_PMACCT_CUSTOM
+	tristate
+	default n
+	depends BR2_PACKAGE_NFACCTD_CUSTOM || BR2_PACKAGE_PMACCTD_CUSTOM
+	select BR2_COMPILE_PMACCT
 
 choice
-	depends BR2_PACKAGE_PMACCT
-	prompt "nfacctd - a NetFlow accounting daemon"
+	prompt   "nfacctd......................... NetFlow accounting daemon"
 	tristate
 	default m if CONFIG_DEVEL
-	default n
 	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"
+		prompt     "nfacctd.......................   built without database support"
 		tristate
+		select BR2_COMPILE_PMACCT_BASIC
+		select BR2_PACKAGE_LIBPCAP
 	
 	config BR2_PACKAGE_NFACCTD_MYSQL
-		prompt "nfacctd-mysql: with MySQL database support"
+		prompt     "nfacctd-mysql.................   built with MySQL database support"
 		tristate
+		select BR2_COMPILE_PMACCT_MYSQL
+		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBMYSQLCLIENT
 	
 	config BR2_PACKAGE_NFACCTD_PGSQL
-		prompt "nfacctd-pgsql: with PostgreSQL database support"
+		prompt     "nfacctd-pgsql.................   built with PostgreSQL database support"
 		tristate
+		select BR2_COMPILE_PMACCT_PGSQL
+		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBPQ
 	
 	config BR2_PACKAGE_NFACCTD_CUSTOM
-		prompt "nfacctd-custom: customized to your needs"
+		prompt     "nfacctd-custom................   customized to your needs"
 		tristate
-	
-	config BR2_PACKAGE_NFACCTD_ENABLE_DEBUG
+		select BR2_COMPILE_PMACCT_CUSTOM
+		select BR2_PACKAGE_LIBPCAP
+
+	config BR2_COMPILE_NFACCTD_ENABLE_DEBUG
 		prompt "debug (enable debugging options, useful for bugreports)"
 		bool
 		default n
 		depends BR2_PACKAGE_NFACCTD_CUSTOM
 
-	config BR2_PACKAGE_NFACCTD_ENABLE_IPV6
+	config BR2_COMPILE_NFACCTD_ENABLE_IPV6
 		prompt "IPv6 support"
 		bool
 		default n
 		depends BR2_PACKAGE_NFACCTD_CUSTOM
-		select BR2_PACKAGE_IPTABLES
 
-	config BR2_PACKAGE_NFACCTD_WITH_MYSQL
+	config BR2_COMPILE_NFACCTD_WITH_MYSQL
 		prompt "MySQL database support"
 		bool
 		default n
 		depends BR2_PACKAGE_NFACCTD_CUSTOM
 		select BR2_PACKAGE_LIBMYSQLCLIENT
 
-	config BR2_PACKAGE_NFACCTD_WITH_PGSQL
+	config BR2_COMPILE_NFACCTD_WITH_PGSQL
 		prompt "PostgreSQL database support"
 		bool
 		default n
@@ -66,52 +99,68 @@ choice
 endchoice
 
 choice
-	depends BR2_PACKAGE_PMACCT
-	prompt "pmacctd - an IP accounting daemon"
+	prompt   "pmacctd......................... IP accounting daemon (libpcap based)"
 	tristate
 	default m if CONFIG_DEVEL
-	default n
 	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"
+		prompt     "pmacctd.......................   built without database support"
 		tristate
-	
+		select BR2_COMPILE_PMACCT_BASIC
+		select BR2_PACKAGE_LIBPCAP
+
 	config BR2_PACKAGE_PMACCTD_MYSQL
-		prompt "pmacctd-mysql: with MySQL database support"
+		prompt     "pmacctd-mysql.................   built with MySQL database support"
 		tristate
+		select BR2_COMPILE_PMACCT_MYSQL
+		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBMYSQLCLIENT
 	
 	config BR2_PACKAGE_PMACCTD_PGSQL
-		prompt "pmacctd-pgsql: with PostgreSQL database support"
+		prompt     "pmacctd-pgsql.................   built with PostgreSQL database support"
 		tristate
+		select BR2_COMPILE_PMACCT_PGSQL
+		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBPQ
 	
 	config BR2_PACKAGE_PMACCTD_CUSTOM
-		prompt "pmacctd-custom: customized to your needs"
+		prompt     "pmacctd-custom................   customized to your needs"
 		tristate
+		select BR2_COMPILE_PMACCT_CUSTOM
+		select BR2_PACKAGE_LIBPCAP
 	
-	config BR2_PACKAGE_PMACCTD_ENABLE_DEBUG
+	config BR2_COMPILE_PMACCTD_ENABLE_DEBUG
 		prompt "debug (enable debugging options, useful for bugreports)"
 		bool
 		default n
 		depends BR2_PACKAGE_PMACCTD_CUSTOM
 
-	config BR2_PACKAGE_PMACCTD_ENABLE_IPV6
+	config BR2_COMPILE_PMACCTD_ENABLE_IPV6
 		prompt "IPv6 support"
 		bool
 		default n
 		depends BR2_PACKAGE_PMACCTD_CUSTOM
-		select BR2_PACKAGE_IPTABLES
 
-	config BR2_PACKAGE_PMACCTD_WITH_MYSQL
+	config BR2_COMPILE_PMACCTD_WITH_MYSQL
 		prompt "MySQL database support"
 		bool
 		default n
 		depends BR2_PACKAGE_PMACCTD_CUSTOM
 		select BR2_PACKAGE_LIBMYSQLCLIENT
 
-	config BR2_PACKAGE_PMACCTD_WITH_PGSQL
+	config BR2_COMPILE_PMACCTD_WITH_PGSQL
 		prompt "PostgreSQL database support"
 		bool
 		default n
@@ -121,20 +170,9 @@ choice
 endchoice
 
 config BR2_PACKAGE_PMACCT_CLIENT
-	depends BR2_PACKAGE_PMACCT
-	prompt "pmacct-client: a command-line client to gather data from the IMT plugin" if BR2_PACKAGE_NFACCTD_BASIC || BR2_PACKAGE_NFACCTD_MYSQL || BR2_PACKAGE_NFACCTD_PGSQL || BR2_PACKAGE_NFACCTD_CUSTOM || BR2_PACKAGE_PMACCTD_BASIC || BR2_PACKAGE_PMACCTD_MYSQL || BR2_PACKAGE_PMACCTD_PGSQL || BR2_PACKAGE_PMACCTD_CUSTOM
+	prompt   "pmacct-client................... Command-line client to gather data from the IMT plugin"
 	tristate
 	default n
+	select BR2_COMPILE_PMACCT
 
-config BR2_PACKAGE_PMACCT_BASIC
-	tristate
-	default BR2_PACKAGE_NFACCTD_BASIC || BR2_PACKAGE_PMACCTD_BASIC
-
-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
-
+endmenu