summaryrefslogtreecommitdiff
path: root/package/Config.in
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-06-30 12:55:29 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2008-06-30 12:55:29 +0000
commitd4e56ff4dc8a0528550eb8503956bdcddb2fe516 (patch)
tree2d6f8114da90ab526a5d7595c55ad8559de64366 /package/Config.in
parentaf593cbceefb461c8c089395ff257c05cd290af7 (diff)
packages: fix xorg to compile modular and tiny versions
Based on googlecode r558 by John Voltz.
Diffstat (limited to 'package/Config.in')
-rw-r--r--package/Config.in24
1 files changed, 4 insertions, 20 deletions
diff --git a/package/Config.in b/package/Config.in
index e9145f87b..29e1b37af 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -353,24 +353,15 @@ source "package/qtopia4/Config.in"
#source "package/microwin/Config.in"
-choice
-prompt "X Window System server"
- default BR2_PACKAGE_XSERVER_none
- help
- Xserver to use.
- For more information about the X protocol see
- http://www.x.org
- You may have to enable LOCALE and WCHAR to build
+menu "X Window System server"
config BR2_PACKAGE_XSERVER_none
bool "none"
-config BR2_PACKAGE_XSERVER_x11r7
- bool "x11r7"
config BR2_PACKAGE_XSERVER_xorg
- bool "xorg"
+ bool "modular xorg"
config BR2_PACKAGE_XSERVER_tinyx
bool "tinyx"
-endchoice
+endmenu
config BR2_X11_PREFIX
string
@@ -379,16 +370,9 @@ config BR2_X11_PREFIX
help
X11 apps root location
-if BR2_PACKAGE_XSERVER_x11r7
+if !BR2_PACKAGE_XSERVER_none
source "package/x11r7/Config.in"
endif
-if BR2_PACKAGE_XSERVER_xorg
-source "package/xorg/Config.in"
-endif
-if BR2_PACKAGE_XSERVER_tinyx
-source "package/tinyx/Config.in"
-source "package/tinyx-old/Config.in"
-endif
comment "X libraries and helper libraries"
#XXX: maybe some of these should depend on !BR2_PACKAGE_XSERVER_none