simplify buildsystem

- remove ADK_IPV6, ADK_CXX and ADK_X11
- enable ipv6 by default in uclibc
- enable build of c++ compiler by default

26 files changed, 30 insertions, 66 deletions

diff --git a/target/Config.in b/target/Config.in
index 51fe1ea5c..52757e37c 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -250,12 +250,12 @@ config ADK_LINUX_ARM_G1
 	 Just toolchain support to cross-compile your own
 	 applications. Use static linking for your packages.
 
-#config ADK_LINUX_XSCALE_ZAURUS
-#	bool "Zaurus SL-C3200"
-#	select ADK_zaurus
-#	select ADK_TARGET_NO_FPU
-#	help
-#	 Support for Sharp Zaurus SL-C3200 (aka Terrier)
+config ADK_LINUX_XSCALE_ZAURUS
+	bool "Zaurus SL-C3200"
+	select ADK_zaurus
+	select ADK_TARGET_NO_FPU
+	help
+	 Support for Sharp Zaurus SL-C3200 (aka Terrier)
 
 config ADK_LINUX_RESCUE
 	bool "Minimal Linux Rescuesystem"
@@ -772,38 +772,4 @@ config ADK_TARGET_PACKAGE_RPM
 
 endchoice
 
-# broken and untested right now
-#config ADK_SSP
-#	bool "Enable Stack Smashing Protection"
-#	default n
-#	depends on ADK_LINUX_X86_ALIX1C || \
-#		ADK_LINUX_CRIS_FOXBOARD
-#	help
-#	  Enable Stack Smashing Protection
-
-config ADK_CXX
-	bool "Enable C++ support"
-	default n
-	help
-	  Enable C++ compiler and libraries.
-
-config ADK_IPV6
-	bool "Enable IPv6 support"
-	default n
-	select ADK_KPACKAGE_KMOD_IPV6
-	select BUSYBOX_FEATURE_IPV6
-	select BUSYBOX_FEATURE_IFUPDOWN_IPV6
-	select BUSYBOX_PING6
-	help
-	  Enable basic IPv6 support and
-	  make the IPv6 support options in packages visible.
-
-config ADK_X11
-	bool "Enable X.org/X11 support"
-	default n
-	help
-	  Enable Xorg/X11 server and applications in menu.
-	  Try to compile other packages with X11 support. 
-	  (f.e. mplayer)
-
 endmenu
diff --git a/target/alix1c/uclibc.config b/target/alix1c/uclibc.config
index 48742fb5c..f98da5b03 100644
--- a/target/alix1c/uclibc.config
+++ b/target/alix1c/uclibc.config
@@ -144,7 +144,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/alix2d/uclibc.config b/target/alix2d/uclibc.config
index 48742fb5c..f98da5b03 100644
--- a/target/alix2d/uclibc.config
+++ b/target/alix2d/uclibc.config
@@ -144,7 +144,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/foxboard/uclibc.config b/target/foxboard/uclibc.config
index 19c3e431f..50ba1fc5b 100644
--- a/target/foxboard/uclibc.config
+++ b/target/foxboard/uclibc.config
@@ -145,7 +145,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/g1/uclibc.config b/target/g1/uclibc.config
index e4fe4e87e..52ec386f5 100644
--- a/target/g1/uclibc.config
+++ b/target/g1/uclibc.config
@@ -146,7 +146,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/lemote/uclibc.config b/target/lemote/uclibc.config
index 9155c26a6..4ad8cae77 100644
--- a/target/lemote/uclibc.config
+++ b/target/lemote/uclibc.config
@@ -135,7 +135,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 7611c03aa..349f4a9fd 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -124,7 +124,6 @@ config ADK_KPACKAGE_KMOD_NET_IPGRE
 config ADK_KPACKAGE_KMOD_IPV6
 	prompt "kmod-ipv6......................... IPv6 support"
 	tristate
-	depends on ADK_IPV6
 	default n
 	help
 	  This is complemental support for the IP version 6.
@@ -139,7 +138,6 @@ config ADK_KPACKAGE_KMOD_IPV6
 config ADK_KPACKAGE_KMOD_IPV6_SIT
 	prompt "kmod-ipv6-sit..................... IPv6-in-IPv4 tunnel (SIT driver)"
 	tristate
-	depends on ADK_IPV6
 	select ADK_KPACKAGE_KMOD_INET_TUNNEL
 	default n
 	help
diff --git a/target/native/uclibc.config b/target/native/uclibc.config
index ed46e1519..f779cc8bf 100644
--- a/target/native/uclibc.config
+++ b/target/native/uclibc.config
@@ -144,7 +144,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/qemu-arm/uclibc.config b/target/qemu-arm/uclibc.config
index 21c2be25a..323249401 100644
--- a/target/qemu-arm/uclibc.config
+++ b/target/qemu-arm/uclibc.config
@@ -147,7 +147,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/qemu-cris/uclibc.config b/target/qemu-cris/uclibc.config
index 4678e3b43..0bd868976 100644
--- a/target/qemu-cris/uclibc.config
+++ b/target/qemu-cris/uclibc.config
@@ -145,7 +145,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/qemu-mips/uclibc.config b/target/qemu-mips/uclibc.config
index b32f17451..ee7d7cefd 100644
--- a/target/qemu-mips/uclibc.config
+++ b/target/qemu-mips/uclibc.config
@@ -136,7 +136,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/qemu-mips64/uclibc.config b/target/qemu-mips64/uclibc.config
index b20961785..e2bd9a4b0 100644
--- a/target/qemu-mips64/uclibc.config
+++ b/target/qemu-mips64/uclibc.config
@@ -136,7 +136,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/qemu-mips64el/uclibc.config b/target/qemu-mips64el/uclibc.config
index dd82c5b6f..5642d5879 100644
--- a/target/qemu-mips64el/uclibc.config
+++ b/target/qemu-mips64el/uclibc.config
@@ -136,7 +136,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/qemu-mipsel/uclibc.config b/target/qemu-mipsel/uclibc.config
index 223c3ddd9..dbf8ed75d 100644
--- a/target/qemu-mipsel/uclibc.config
+++ b/target/qemu-mipsel/uclibc.config
@@ -153,7 +153,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/qemu-x86/uclibc.config b/target/qemu-x86/uclibc.config
index ea622b4dd..94ba1ef20 100644
--- a/target/qemu-x86/uclibc.config
+++ b/target/qemu-x86/uclibc.config
@@ -144,7 +144,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/qemu-x86_64/uclibc.config b/target/qemu-x86_64/uclibc.config
index 97360c23b..c622507cd 100644
--- a/target/qemu-x86_64/uclibc.config
+++ b/target/qemu-x86_64/uclibc.config
@@ -144,7 +144,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/rb411/uclibc.config b/target/rb411/uclibc.config
index 4f35e8d4c..c48d01864 100644
--- a/target/rb411/uclibc.config
+++ b/target/rb411/uclibc.config
@@ -136,7 +136,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/rb433/uclibc.config b/target/rb433/uclibc.config
index 4f35e8d4c..c48d01864 100644
--- a/target/rb433/uclibc.config
+++ b/target/rb433/uclibc.config
@@ -136,7 +136,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/rb532/uclibc.config b/target/rb532/uclibc.config
index ef48640be..9a6a88401 100644
--- a/target/rb532/uclibc.config
+++ b/target/rb532/uclibc.config
@@ -135,7 +135,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/rescue-x86/uclibc.config b/target/rescue-x86/uclibc.config
index ed46e1519..f779cc8bf 100644
--- a/target/rescue-x86/uclibc.config
+++ b/target/rescue-x86/uclibc.config
@@ -144,7 +144,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/rescue-x86_64/uclibc.config b/target/rescue-x86_64/uclibc.config
index df52f1782..b3f05febe 100644
--- a/target/rescue-x86_64/uclibc.config
+++ b/target/rescue-x86_64/uclibc.config
@@ -127,7 +127,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/shuttle/uclibc.config b/target/shuttle/uclibc.config
index df52f1782..b3f05febe 100644
--- a/target/shuttle/uclibc.config
+++ b/target/shuttle/uclibc.config
@@ -127,7 +127,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/tomtom/uclibc.config b/target/tomtom/uclibc.config
index e4fe4e87e..52ec386f5 100644
--- a/target/tomtom/uclibc.config
+++ b/target/tomtom/uclibc.config
@@ -146,7 +146,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/wag54g/uclibc.config b/target/wag54g/uclibc.config
index 24186882e..bc9ffb3fc 100644
--- a/target/wag54g/uclibc.config
+++ b/target/wag54g/uclibc.config
@@ -136,7 +136,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/wrap/uclibc.config b/target/wrap/uclibc.config
index 48742fb5c..f98da5b03 100644
--- a/target/wrap/uclibc.config
+++ b/target/wrap/uclibc.config
@@ -144,7 +144,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y
diff --git a/target/zaurus/uclibc.config b/target/zaurus/uclibc.config
index 21c2be25a..323249401 100644
--- a/target/zaurus/uclibc.config
+++ b/target/zaurus/uclibc.config
@@ -147,7 +147,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y