X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/5740e07504facba47dcb782add94345c483092cf..c2bc3fad79854d9470a35f6a88cd1556e65ca535:/openwrt/package/pmacct/Config.in

diff --git a/openwrt/package/pmacct/Config.in b/openwrt/package/pmacct/Config.in
index a0c7cbb5f..af4868e0f 100644
--- a/openwrt/package/pmacct/Config.in
+++ b/openwrt/package/pmacct/Config.in
@@ -1,40 +1,66 @@
+menu "pmacct - IPv4/IPv6 accounting and aggregation tools"
+
 config BR2_PACKAGE_PMACCT
-	prompt "pmacct - IPv4/IPv6 accounting and aggregation tools"
 	bool
-	default y if CONFIG_DEVEL
+	default n
 	select BR2_PACKAGE_LIBPCAP
-	help
-	  A small set of IPv4/IPv6 accounting and aggregation tools
-	  
-	  http://www.ba.cnr.it/~paolo/pmacct/
-	  
-	  Depends: 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_PMACCT_BASIC
 	
 	config BR2_PACKAGE_NFACCTD_MYSQL
 		prompt "nfacctd-mysql: with MySQL database support"
 		tristate
-		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_LIBPQ
+		select BR2_PACKAGE_PMACCT_PGSQL
 	
 	config BR2_PACKAGE_NFACCTD_CUSTOM
 		prompt "nfacctd-custom: customized to your needs"
 		tristate
-	
+		select BR2_PACKAGE_PMACCT
+
 	config BR2_PACKAGE_NFACCTD_ENABLE_DEBUG
 		prompt "debug (enable debugging options, useful for bugreports)"
 		bool
@@ -46,7 +72,6 @@ choice
 		bool
 		default n
 		depends BR2_PACKAGE_NFACCTD_CUSTOM
-		select BR2_PACKAGE_IPTABLES
 
 	config BR2_PACKAGE_NFACCTD_WITH_MYSQL
 		prompt "MySQL database support"
@@ -67,27 +92,40 @@ endchoice
 choice
 	prompt "pmacctd - IP accounting daemon (libpcap based)"
 	tristate
-	optional
 	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_PMACCT_BASIC
+
 	config BR2_PACKAGE_PMACCTD_MYSQL
 		prompt "pmacctd-mysql: with MySQL database support"
 		tristate
-		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_LIBPQ
+		select BR2_PACKAGE_PMACCT_PGSQL
 	
 	config BR2_PACKAGE_PMACCTD_CUSTOM
 		prompt "pmacctd-custom: customized to your needs"
 		tristate
+		select BR2_PACKAGE_PMACCT
 	
 	config BR2_PACKAGE_PMACCTD_ENABLE_DEBUG
 		prompt "debug (enable debugging options, useful for bugreports)"
@@ -100,7 +138,6 @@ choice
 		bool
 		default n
 		depends BR2_PACKAGE_PMACCTD_CUSTOM
-		select BR2_PACKAGE_IPTABLES
 
 	config BR2_PACKAGE_PMACCTD_WITH_MYSQL
 		prompt "MySQL database support"
@@ -119,20 +156,9 @@ choice
 endchoice
 
 config BR2_PACKAGE_PMACCT_CLIENT
-	prompt "pmacct-client - 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
-	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
-
-config BR2_PACKAGE_PMACCT_MYSQL
-	tristate
-	default BR2_PACKAGE_NFACCTD_MYSQL || BR2_PACKAGE_PMACCTD_MYSQL
-
-config BR2_PACKAGE_PMACCT_PGSQL
+	prompt "pmacct-client - Command-line client to gather data from the IMT plugin"
 	tristate
-	default BR2_PACKAGE_NFACCTD_PGSQL || BR2_PACKAGE_PMACCTD_PGSQL
+	default n
+	select BR2_PACKAGE_PMACCT
 
+endmenu