summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-01-06 11:29:13 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-01-08 23:12:09 (GMT)
commit940fcba1a5d86d7f3dd20b2ae953bb15eeb95042 (patch)
treef89636972f7cfe5d020550b94ae1e2cdea7d88cb
parenta1cfe20df6c6b4f148db0c104e8ff701654a2c09 (diff)
downloadbuildroot-940fcba1a5d86d7f3dd20b2ae953bb15eeb95042.tar.gz
buildroot-940fcba1a5d86d7f3dd20b2ae953bb15eeb95042.tar.bz2
x11r7: move X.org server style option
The selection between "modular" server and "Kdrive" server really belongs as a sub-option of the X.org server itself, rather than as a global x11r7 option. So we move it under the X.org server option. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/x11r7/Config.in18
-rw-r--r--package/x11r7/xserver_xorg-server/Config.in18
2 files changed, 18 insertions, 18 deletions
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 2aac5a2..dc84798 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -13,24 +13,6 @@ menuconfig BR2_PACKAGE_XORG7
if BR2_PACKAGE_XORG7
-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"
- depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP
-
-comment 'X.org requires largefile and C++ support'
- depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP)
-
-config BR2_PACKAGE_XSERVER_tinyx
- bool "TinyX"
-
-endchoice
-
menu "X11R7 Servers"
source package/x11r7/xserver_xorg-server/Config.in
endmenu
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 02c2828..bea0ffa 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -59,6 +59,24 @@ comment "xorg-xserver is BROKEN on AVR32"
if BR2_PACKAGE_XSERVER_XORG_SERVER
+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"
+ depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP
+
+comment "X.org requires largefile and C++ support"
+ depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP)
+
+config BR2_PACKAGE_XSERVER_tinyx
+ bool "TinyX"
+
+endchoice
+
config BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR
bool "Null root cursor"
help