From 97f233b93cd62921230137249da9f109b6b76ef6 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 22 May 2005 09:26:11 +0000
Subject: [PATCH] Standardize config structure

SVN-Revision: 1014
---
 openwrt/package/pmacct/Config.in | 12 +++++-------
 openwrt/package/snort/Config.in  |  3 +--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/openwrt/package/pmacct/Config.in b/openwrt/package/pmacct/Config.in
index 3c1f9532bb..a0c7cbb5f0 100644
--- a/openwrt/package/pmacct/Config.in
+++ b/openwrt/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/openwrt/package/snort/Config.in b/openwrt/package/snort/Config.in
index db6133545c..ff79cfafdc 100644
--- a/openwrt/package/snort/Config.in
+++ b/openwrt/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
-