backport fixes from changeset:2408 to trunk

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

diff --git a/openwrt/package/pmacct/Config.in b/openwrt/package/pmacct/Config.in
index b4b2e4d..cd3966d 100644 (file)
--- a/openwrt/package/pmacct/Config.in
+++ b/openwrt/package/pmacct/Config.in
@@ -1,63 +1,95 @@
-config BR2_PACKAGE_PMACCT
-       prompt "pmacct - IPv4/IPv6 accounting and aggregation tools"
+menu "pmacct............................ IPv4/IPv6 accounting and aggregation tools"
+
+config BR2_COMPILE_PMACCT

        bool
        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_COMPILE_PMACCT_BASIC || BR2_COMPILE_PMACCT_MYSQL || BR2_COMPILE_PMACCT_PGSQL || BR2_COMPILE_PMACCT_CUSTOM
+
+config BR2_COMPILE_PMACCT_BASIC
+       bool
+       default n
+       depends BR2_PACKAGE_NFACCTD_BASIC || BR2_PACKAGE_PMACCTD_BASIC
+       select BR2_COMPILE_PMACCT
+
+config BR2_COMPILE_PMACCT_MYSQL
+       bool
+       default n
+       depends BR2_PACKAGE_NFACCTD_MYSQL || BR2_PACKAGE_PMACCTD_MYSQL
+       select BR2_COMPILE_PMACCT
+
+config BR2_COMPILE_PMACCT_PGSQL
+       bool
+       default n
+       depends BR2_PACKAGE_NFACCTD_PGSQL || BR2_PACKAGE_PMACCTD_PGSQL
+       select BR2_COMPILE_PMACCT
+
+config BR2_COMPILE_PMACCT_CUSTOM
+       bool
+       default n
+       depends BR2_PACKAGE_NFACCTD_CUSTOM || BR2_PACKAGE_PMACCTD_CUSTOM
+       select BR2_COMPILE_PMACCT

 
 choice
 
 choice

-       prompt "nfacctd - NetFlow accounting daemon"
+       prompt   "nfacctd......................... NetFlow accounting daemon"

        tristate
        default m if CONFIG_DEVEL
        tristate
        default m if CONFIG_DEVEL

-       depends BR2_PACKAGE_PMACCT

        optional
        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
        
        config BR2_PACKAGE_NFACCTD_BASIC

-               prompt "nfacctd: without database support"
+               prompt     "nfacctd.......................   built without database support"

                tristate
                tristate

+               select BR2_COMPILE_PMACCT_BASIC

                select BR2_PACKAGE_LIBPCAP
        
        config BR2_PACKAGE_NFACCTD_MYSQL
                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
                tristate

+               select BR2_COMPILE_PMACCT_MYSQL

                select BR2_PACKAGE_LIBPCAP
                select BR2_PACKAGE_LIBMYSQLCLIENT
        
        config BR2_PACKAGE_NFACCTD_PGSQL
                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
                tristate

+               select BR2_COMPILE_PMACCT_PGSQL

                select BR2_PACKAGE_LIBPCAP
                select BR2_PACKAGE_LIBPQ
        
        config BR2_PACKAGE_NFACCTD_CUSTOM
                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
                tristate

+               select BR2_COMPILE_PMACCT_CUSTOM

                select BR2_PACKAGE_LIBPCAP
 
                select BR2_PACKAGE_LIBPCAP
 

-       config BR2_PACKAGE_NFACCTD_ENABLE_DEBUG
+       config BR2_COMPILE_NFACCTD_ENABLE_DEBUG

                prompt "debug (enable debugging options, useful for bugreports)"
                bool
                default n
                depends BR2_PACKAGE_NFACCTD_CUSTOM
 
                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
 
                prompt "IPv6 support"
                bool
                default n
                depends BR2_PACKAGE_NFACCTD_CUSTOM
 

-       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
 
                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
                prompt "PostgreSQL database support"
                bool
                default n


@@ -67,54 +99,68 @@ choice
 endchoice
 
 choice
 endchoice
 
 choice

-       prompt "pmacctd - IP accounting daemon (libpcap based)"
+       prompt   "pmacctd......................... IP accounting daemon (libpcap based)"

        tristate
        default m if CONFIG_DEVEL
        tristate
        default m if CONFIG_DEVEL

-       depends BR2_PACKAGE_PMACCT

        optional
        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
        
        config BR2_PACKAGE_PMACCTD_BASIC

-               prompt "pmacctd: without database support"
+               prompt     "pmacctd.......................   built without database support"

                tristate
                tristate

+               select BR2_COMPILE_PMACCT_BASIC

                select BR2_PACKAGE_LIBPCAP
 
        config BR2_PACKAGE_PMACCTD_MYSQL
                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
                tristate

+               select BR2_COMPILE_PMACCT_MYSQL

                select BR2_PACKAGE_LIBPCAP
                select BR2_PACKAGE_LIBMYSQLCLIENT
        
        config BR2_PACKAGE_PMACCTD_PGSQL
                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
                tristate

+               select BR2_COMPILE_PMACCT_PGSQL

                select BR2_PACKAGE_LIBPCAP
                select BR2_PACKAGE_LIBPQ
        
        config BR2_PACKAGE_PMACCTD_CUSTOM
                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
                tristate

+               select BR2_COMPILE_PMACCT_CUSTOM

                select BR2_PACKAGE_LIBPCAP
        
                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
 
                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
 
                prompt "IPv6 support"
                bool
                default n
                depends BR2_PACKAGE_PMACCTD_CUSTOM
 

-       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
 
                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
                prompt "PostgreSQL database support"
                bool
                default n


@@ -124,20 +170,9 @@ choice
 endchoice
 
 config BR2_PACKAGE_PMACCT_CLIENT
 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
+       prompt   "pmacct-client................... Command-line client to gather data from the IMT plugin"

        tristate
        tristate

-       default BR2_PACKAGE_NFACCTD_PGSQL || BR2_PACKAGE_PMACCTD_PGSQL
+       default n
+       select BR2_COMPILE_PMACCT

 
 

+endmenu