summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/Config.in32
-rw-r--r--package/x11r7/Config.in31
2 files changed, 28 insertions, 35 deletions
diff --git a/package/Config.in b/package/Config.in
index cb8356311..7e7ca0027 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -318,39 +318,7 @@ source "package/qtopia4/Config.in"
#source "package/microwin/Config.in"
-
-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"
-config BR2_PACKAGE_XSERVER_xorg
- bool "modular xorg"
- depends on BR2_USE_WCHAR && BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP # && BR2_ENABLE_LOCALE
-# depending on BR2_ENABLE_LOCALE gives a recursion error with dbus
-config BR2_PACKAGE_XSERVER_tinyx
- bool "tinyx"
- depends on BR2_USE_WCHAR
-endchoice
-
-comment "xorg requires a toolchain with C++, LOCALE, LARGEFILE and WCHAR support"
- depends on !(BR2_USE_WCHAR && BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE)
-comment "tinyx requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
-
-config BR2_X11_PREFIX
- string
- default "/usr/X11R6" if BR2_PACKAGE_XSERVER_xorg
- default "/usr" if BR2_PACKAGE_XSERVER_tinyx
- help
- X11 apps root location
-
-if !BR2_PACKAGE_XSERVER_none
source "package/x11r7/Config.in"
-endif
comment "X libraries and helper libraries"
#XXX: maybe some of these should depend on !BR2_PACKAGE_XSERVER_none
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 0720e3fac..7af62ee07 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -10,9 +10,34 @@ help
applications in the target.
if BR2_PACKAGE_XORG7
- menu "X11R7 Servers"
- source package/x11r7/xserver_xorg-server/Config.in
- endmenu
+
+choice
+ prompt "X Window System server type"
+ default BR2_PACKAGE_XSERVER_tinyx
+ help
+ Select the X Window System server to use
+
+config BR2_PACKAGE_XSERVER_xorg
+ bool "Modular X.org"
+ # depending on BR2_ENABLE_LOCALE gives a recursion error with dbus
+ depends on BR2_USE_WCHAR && BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP # && BR2_ENABLE_LOCALE
+
+config BR2_PACKAGE_XSERVER_tinyx
+ bool "TinyX"
+ depends on BR2_USE_WCHAR
+
+endchoice
+
+config BR2_X11_PREFIX
+ string
+ default "/usr/X11R6" if BR2_PACKAGE_XSERVER_xorg
+ default "/usr" if BR2_PACKAGE_XSERVER_tinyx
+ help
+ X11 apps root location
+
+menu "X11R7 Servers"
+ source package/x11r7/xserver_xorg-server/Config.in
+endmenu
menu "X11R7 Libraries"
source package/x11r7/libxcb/Config.in
source package/x11r7/mesa3d/Config.in