summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-08-22 14:24:53 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2008-08-22 14:24:53 +0000
commitbf83d53080845f633d114250abc8b6ae88700873 (patch)
treefef82e29019bd610bc04d571856c7c1ffab95c42
parent9e9e354a83c6a913062f143a1308ae19661f4a97 (diff)
xorg: depend on WCHAR and LOCALE
Xorg needs WCHAR and LOCALE, so make sure it cannot be selected unless this is enabled in the toolchain. We unfortunately cannot make BR2_XSERVER_xorg depend on BR2_USE_LOCALE because of a strange recursion error with dbus, but now we atleast inform the user what to do to get a working configuration. The real solution is ofcause of fix xorg, but that's for another day.
-rw-r--r--package/Config.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/package/Config.in b/package/Config.in
index f437eb25c..24cd4f5ae 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -353,6 +353,10 @@ config BR2_PACKAGE_XSERVER_none
default y
config BR2_PACKAGE_XSERVER_xorg
bool "modular xorg"
+ depends on BR2_USE_WCHAR # && BR2_ENABLE_LOCALE
+# depending on BR2_ENABLE_LOCALE gives a recursion error with dbus
+comment "xorg requires a toolchain with LOCALE and WCHAR support"
+ depends on !(BR2_USE_WCHAR && BR2_ENABLE_LOCALE)
config BR2_PACKAGE_XSERVER_tinyx
bool "tinyx"
endmenu