package: make X server selection a choice and fix tinyx prefix

This commit is contained in:
Peter Korsgaard 2008-12-28 22:28:49 +00:00
parent 960bbc63ba
commit 3fa8550d11

View File

@ -315,7 +315,12 @@ source "package/qtopia4/Config.in"
#source "package/microwin/Config.in" #source "package/microwin/Config.in"
menu "X Window System server" choice
prompt "X Window System server"
default BR2_PACKAGE_XSERVER_none
help
Select the X Window System server to use
config BR2_PACKAGE_XSERVER_none config BR2_PACKAGE_XSERVER_none
bool "none" bool "none"
default y default y
@ -327,12 +332,12 @@ comment "xorg requires a toolchain with LOCALE and WCHAR support"
depends on !(BR2_USE_WCHAR && BR2_ENABLE_LOCALE) depends on !(BR2_USE_WCHAR && BR2_ENABLE_LOCALE)
config BR2_PACKAGE_XSERVER_tinyx config BR2_PACKAGE_XSERVER_tinyx
bool "tinyx" bool "tinyx"
endmenu endchoice
config BR2_X11_PREFIX config BR2_X11_PREFIX
string string
default "/usr/X11R6" if BR2_PACKAGE_XSERVER_xorg || BR2_PACKAGE_XSERVER_tinyx default "/usr/X11R6" if BR2_PACKAGE_XSERVER_xorg
default "/usr" if !BR2_PACKAGE_XSERVER_xorg && !BR2_PACKAGE_XSERVER_tinyx default "/usr" if BR2_PACKAGE_XSERVER_tinyx
help help
X11 apps root location X11 apps root location