瀏覽代碼

- add a choice for Xserver selection.
This is ment as a suggestion Re: http://lists.busybox.net/lists/buildroot/2007-July/003835.html

Bernhard Reutner-Fischer 18 年之前
父節點
當前提交
c5757aad70
共有 3 個文件被更改,包括 23 次插入4 次删除
  1. 21 1
      package/Config.in
  2. 1 1
      package/tinyx/Config.in
  3. 1 2
      package/xorg/Config.in

+ 21 - 1
package/Config.in

@@ -303,10 +303,30 @@ source "package/qtopia4/Config.in"
 
 
 #source "package/microwin/Config.in"
 #source "package/microwin/Config.in"
 
 
-comment "X Window System server"
+choice
+prompt "X Window System server"
+	default BR2_PACKAGE_XSERVER_none
+	help
+	  Xserver to use.
+	  For more information about the X protocol see
+	  http://www.x.org
+
+config BR2_PACKAGE_XSERVER_none
+	bool "none"
+config BR2_PACKAGE_XSERVER_xorg
+	bool "xorg"
+config BR2_PACKAGE_XSERVER_tinyx
+	bool "tinyx"
+endchoice
+if BR2_PACKAGE_XSERVER_xorg
 source "package/xorg/Config.in"
 source "package/xorg/Config.in"
+endif
+if BR2_PACKAGE_XSERVER_tinyx
 source "package/tinyx/Config.in"
 source "package/tinyx/Config.in"
+endif
+
 comment "X libraries and helper libraries"
 comment "X libraries and helper libraries"
+#XXX: maybe some of these should depend on !BR2_PACKAGE_XSERVER_none
 source "package/atk/Config.in"
 source "package/atk/Config.in"
 source "package/cairo/Config.in"
 source "package/cairo/Config.in"
 source "package/pango/Config.in"
 source "package/pango/Config.in"

+ 1 - 1
package/tinyx/Config.in

@@ -1,5 +1,5 @@
 config BR2_PACKAGE_TINYX
 config BR2_PACKAGE_TINYX
 	bool "tinyx"
 	bool "tinyx"
-	default n
+	default y if BR2_PACKAGE_XSERVER_tinyx
 	help
 	help
 	  A tiny X server.  Also known as 'Xfbdev' and 'kdrive'.
 	  A tiny X server.  Also known as 'Xfbdev' and 'kdrive'.

+ 1 - 2
package/xorg/Config.in

@@ -1,7 +1,6 @@
 config BR2_PACKAGE_XORG
 config BR2_PACKAGE_XORG
 	bool "X.org X Window System"
 	bool "X.org X Window System"
-	default n
-	depends !BR2_PACKAGE_TINYX
+	default y if BR2_PACKAGE_XSERVER_xorg
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_EXPAT