add a load of fixes from whiterussian to head

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

diff --git a/package/pmacct/Config.in b/package/pmacct/Config.in
index b4b2e4d..e050b4e 100644 (file)
--- a/package/pmacct/Config.in
+++ b/package/pmacct/Config.in
@@ -1,41 +1,74 @@
+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
+       depends BR2_PACKAGE_PMACCT_BASIC || BR2_PACKAGE_PMACCT_MYSQL || BR2_PACKAGE_PMACCT_PGSQL || BR2_PACKAGE_PMACCT_CUSTOM || BR2_PACKAGE_PMACCT_CLIENT
+
+config BR2_PACKAGE_PMACCT_BASIC
+       bool
+       default n
+       depends BR2_PACKAGE_NFACCTD_BASIC || BR2_PACKAGE_PMACCTD_BASIC
+       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
+
+config BR2_PACKAGE_PMACCT_PGSQL
+       bool
+       default n
+       depends BR2_PACKAGE_NFACCTD_PGSQL || BR2_PACKAGE_PMACCTD_PGSQL
+       select BR2_PACKAGE_PMACCT
+
+config BR2_PACKAGE_PMACCT_CUSTOM
+       bool
+       default n
+       depends BR2_PACKAGE_NFACCTD_CUSTOM || BR2_PACKAGE_PMACCTD_CUSTOM
+       select BR2_PACKAGE_PMACCT
 
 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
                select BR2_PACKAGE_LIBPCAP
        
        config BR2_PACKAGE_NFACCTD_MYSQL
                prompt "nfacctd-mysql: with MySQL database support"
                tristate
+               select BR2_PACKAGE_PMACCT_MYSQL
                select BR2_PACKAGE_LIBPCAP
                select BR2_PACKAGE_LIBMYSQLCLIENT
        
        config BR2_PACKAGE_NFACCTD_PGSQL
                prompt "nfacctd-pgsql: with PostgreSQL database support"
                tristate
+               select BR2_PACKAGE_PMACCT_PGSQL
                select BR2_PACKAGE_LIBPCAP
                select BR2_PACKAGE_LIBPQ
        
        config BR2_PACKAGE_NFACCTD_CUSTOM
                prompt "nfacctd-custom: customized to your needs"
                tristate
+               select BR2_PACKAGE_PMACCT_CUSTOM
                select BR2_PACKAGE_LIBPCAP
 
        config BR2_PACKAGE_NFACCTD_ENABLE_DEBUG
@@ -70,29 +103,44 @@ 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_PMACCT_BASIC
                select BR2_PACKAGE_LIBPCAP
 
        config BR2_PACKAGE_PMACCTD_MYSQL
                prompt "pmacctd-mysql: with MySQL database support"
                tristate
+               select BR2_PACKAGE_PMACCT_MYSQL
                select BR2_PACKAGE_LIBPCAP
                select BR2_PACKAGE_LIBMYSQLCLIENT
        
        config BR2_PACKAGE_PMACCTD_PGSQL
                prompt "pmacctd-pgsql: with PostgreSQL database support"
                tristate
+               select BR2_PACKAGE_PMACCT_PGSQL
                select BR2_PACKAGE_LIBPCAP
                select BR2_PACKAGE_LIBPQ
        
        config BR2_PACKAGE_PMACCTD_CUSTOM
                prompt "pmacctd-custom: customized to your needs"
                tristate
+               select BR2_PACKAGE_PMACCT_CUSTOM
                select BR2_PACKAGE_LIBPCAP
        
        config BR2_PACKAGE_PMACCTD_ENABLE_DEBUG
@@ -126,18 +174,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