From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 8 Apr 2006 17:33:18 +0000 (+0000)
Subject: fix ipsec-tools dependencies
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=fdfccc7699b38ab893a8cd6fcf8d5030b71007f3;p=openwrt-10.03%2F.git

fix ipsec-tools dependencies

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

diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
index 99900eacc..bdd3e210f 100644
--- a/package/ipsec-tools/Config.in
+++ b/package/ipsec-tools/Config.in
@@ -1,10 +1,9 @@
 config BR2_PACKAGE_IPSEC_TOOLS
 	prompt "ipsec-tools....................... IPsec management tools"
 	tristate
-	default m if BR2_LINUX_2_6_BRCM && CONFIG_DEVEL
-	default m if BR2_LINUX_2_6_X86 && CONFIG_DEVEL
+	depends BR2_LINUX_2_6
 	select BR2_PACKAGE_LIBOPENSSL
-	default n
+	default m if CONFIG_DEVEL
 	help
 	  IPsec management tools
 	  
diff --git a/target/Config.in b/target/Config.in
index e6e272d31..dc06dd3b3 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -5,6 +5,7 @@ choice
 config BR2_LINUX_2_6_ARUBA
 	bool "Aruba [2.6]"
 	select BR2_mips
+	select BR2_LINUX_2_6
 	help
           Build firmware images for Aruba boards 
 
@@ -30,6 +31,7 @@ config BR2_LINUX_2_4_BRCM
 config BR2_LINUX_2_6_BRCM
 	bool "Broadcom BCM47xx/53xx [2.6]"
 	select BR2_mipsel
+	select BR2_LINUX_2_6
 	select BR2_LINUX_PCMCIA_SUPPORT
 	help
 	  Build firmware images for Broadcom based routers
@@ -52,6 +54,7 @@ config BR2_LINUX_2_4_X86
 config BR2_LINUX_2_6_X86
 	bool "x86 [2.6]"
 	select BR2_i386
+	select BR2_LINUX_2_6
 	select BR2_LINUX_PCMCIA_SUPPORT
 	help
 	  Build firmware images for x86 based boards
@@ -103,6 +106,11 @@ endif
 
 endchoice
 
+config BR2_LINUX_2_6
+	bool
+	default n
+	depends BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_BRCM || BR2_LINUX_2_6_ARUBA
+
 config BR2_LINUX_PCMCIA_SUPPORT
 	bool
 	default n