summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-10-08 19:22:16 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2009-10-08 19:22:16 (GMT)
commitc9a2b035ee5c70a6c62ceb2df90eda3ea73425c1 (patch)
tree3a8a0528a3ad179bd0ddca7e92a312d86f3c90e2
parent6ef1705c422255301007ec126aa786b8a8b82b86 (diff)
downloadbuildroot-c9a2b035ee5c70a6c62ceb2df90eda3ea73425c1.tar.gz
buildroot-c9a2b035ee5c70a6c62ceb2df90eda3ea73425c1.tar.bz2
x11r7: tweak kconfig
Show comment about what to enable in toolchain to make modular X.org visible, and move comment about x11r7 toolchain dependency to end, as otherwise kconfig gets confused and doesn't put X options under the x11r7 menuconfig. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/x11r7/Config.in9
1 files changed, 6 insertions, 3 deletions
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index b827367..25cc455 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -9,9 +9,6 @@ menuconfig BR2_PACKAGE_XORG7
Support for X11R7 libraries, servers, drivers, and/or
applications in the target.
-comment "X.org requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
-
if BR2_PACKAGE_XORG7
choice
@@ -25,6 +22,9 @@ config BR2_PACKAGE_XSERVER_xorg
# depending on BR2_ENABLE_LOCALE gives a recursion error with dbus
depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP # && BR2_ENABLE_LOCALE
+comment 'X.org requires largefile, locale and C++ support'
+ depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE)
+
config BR2_PACKAGE_XSERVER_tinyx
bool "TinyX"
@@ -330,3 +330,6 @@ endmenu
source package/x11r7/xkeyboard-config/Config.in
endmenu
endif
+
+comment "X.org requires a toolchain with WCHAR support"
+ depends on !BR2_USE_WCHAR