diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-08-04 21:17:40 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-08-04 21:17:40 +0200 |
| commit | bd7b104e4089ce7b396a80c476bb8033b958138f (patch) | |
| tree | 68c42e5f1f3d2ce489724c3e78b5d436297ed10b | |
| parent | 07fcc6ce704e65e115574b893837c749b5484242 (diff) | |
| parent | 070424f0c84a68078ac08fdc908542830f3d843f (diff) | |
| download | buildroot-novena-bd7b104e4089ce7b396a80c476bb8033b958138f.tar.gz buildroot-novena-bd7b104e4089ce7b396a80c476bb8033b958138f.zip | |
Merge branch 'config-choice-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot
| -rw-r--r-- | package/ipsec-tools/Config.in | 4 | ||||
| -rw-r--r-- | package/webkit/Config.in | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in index a55ff0c2d..d29cb8604 100644 --- a/package/ipsec-tools/Config.in +++ b/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 diff --git a/package/webkit/Config.in b/package/webkit/Config.in index e436f9acf..ecf869429 100644 --- a/package/webkit/Config.in +++ b/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 |