Commit 940fcba1 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent a1cfe20d

package/x11r7/Config.in

+0 −18
Original line number Diff line number Diff line
@@ -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

package/x11r7/xserver_xorg-server/Config.in

+18 −0
Original line number Diff line number Diff line
@@ -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