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>

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 2aac5a2d361965f382ad4c7ea6b30a85f2547e78..dc847980f14634e79b0be49ea0cd046464f272c2 100644 (file)
--- 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 02c28282d4d1a9a1915ae4c407da9692752249cb..bea0ffa98b9099d1084d2a63196a456e492c0819 100644 (file)
--- 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