Standardize config structure

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

diff --git a/package/pmacct/Config.in b/package/pmacct/Config.in
index 3c1f953..a0c7cbb 100644 (file)
--- a/package/pmacct/Config.in
+++ b/package/pmacct/Config.in
@@ -11,11 +11,10 @@ config BR2_PACKAGE_PMACCT
          Depends: libpcap
 
 choice
-       depends BR2_PACKAGE_PMACCT
        prompt "nfacctd - NetFlow accounting daemon"
        tristate
        default m if CONFIG_DEVEL
-       default n
+       depends BR2_PACKAGE_PMACCT
        optional
        
        config BR2_PACKAGE_NFACCTD_BASIC
@@ -66,12 +65,11 @@ choice
 endchoice
 
 choice
-       depends BR2_PACKAGE_PMACCT
        prompt "pmacctd - IP accounting daemon (libpcap based)"
        tristate
-       default m if CONFIG_DEVEL
-       default n
        optional
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_PMACCT
        
        config BR2_PACKAGE_PMACCTD_BASIC
                prompt "pmacctd: without database support"
@@ -121,10 +119,10 @@ choice
 endchoice
 
 config BR2_PACKAGE_PMACCT_CLIENT
-       depends BR2_PACKAGE_PMACCT
        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 n
+       default m if CONFIG_DEVEL
+       depends BR2_PACKAGE_PMACCT
 
 config BR2_PACKAGE_PMACCT_BASIC
        tristate

diff --git a/package/snort/Config.in b/package/snort/Config.in
index db61335..ff79cfa 100644 (file)
--- a/package/snort/Config.in
+++ b/package/snort/Config.in
@@ -1,8 +1,8 @@
 choice
        prompt "snort - Ligthweight Network Intrusion Detection System (NIDS)"
        tristate
-       default n
        optional
+       default m if CONFIG_DEVEL
        help
          A ligthweight Network Intrusion Detection System (NIDS)
          
@@ -73,4 +73,3 @@ endchoice
 config BR2_PACKAGE_SNORT
        tristate
        default BR2_PACKAGE_SNORT_BASIC || BR2_PACKAGE_SNORT_MYSQL || BR2_PACKAGE_SNORT_PGSQL || BR2_PACKAGE_SNORT_CUSTOM
-