diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-12-28 22:28:49 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-12-28 22:28:49 +0000 |
| commit | 3fa8550d11b3d08c6fe4acd0dfb243805ca32c84 (patch) | |
| tree | 24819559e0f2b0c54cce84d8f5bb471a53d545f1 | |
| parent | 960bbc63ba443de5883d61f2a11d43c8a137ccb8 (diff) | |
package: make X server selection a choice and fix tinyx prefix
| -rw-r--r-- | package/Config.in | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/package/Config.in b/package/Config.in index ace447dfb..b2845a49a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -315,7 +315,12 @@ source "package/qtopia4/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 bool "none" default y @@ -327,12 +332,12 @@ 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 +endchoice config BR2_X11_PREFIX string - default "/usr/X11R6" if BR2_PACKAGE_XSERVER_xorg || BR2_PACKAGE_XSERVER_tinyx - default "/usr" if !BR2_PACKAGE_XSERVER_xorg && !BR2_PACKAGE_XSERVER_tinyx + default "/usr/X11R6" if BR2_PACKAGE_XSERVER_xorg + default "/usr" if BR2_PACKAGE_XSERVER_tinyx help X11 apps root location |