Merge branch 'config-choice-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot

package/ipsec-tools/Config.in

@@ -61,6 +61,8 @@ config BR2_PACKAGE_IPSEC_TOOLS_LIBS
 	  Install libipsec.a and libracoon.a under staging_dir/lib for further
 	  development on a host machine.
 
+if BR2_PACKAGE_IPSEC_TOOLS
+
 choice
 	prompt "Security context"
 	default BR2_PACKAGE_IPSEC_SECCTX_DISABLE
@@ -77,3 +79,5 @@ config BR2_PACKAGE_IPSEC_SECCTX_KERNEL
 	bool "Enable kernel security context"
 
 endchoice
+
+endif

package/webkit/Config.in

@@ -18,6 +18,8 @@ config BR2_PACKAGE_WEBKIT
 comment "webkit requires a toolchain with C++ support and WCHAR enabled"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
 
+if BR2_PACKAGE_WEBKIT
+
 choice
 	prompt "Rendering target"
 	default BR2_PACKAGE_WEBKIT_X
@@ -32,3 +34,5 @@ config BR2_PACKAGE_WEBKIT_DIRECTFB
 	select BR2_PACKAGE_DIRECTFB
 
 endchoice
+
+endif