- add a choice for Xserver selection.

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

diff --git a/package/Config.in b/package/Config.in
index c4368ded098a9b73da33532a9344eb7bc0b414d3..c0db11b8d78ba12b7f9d208cdcb50f5a8c43725a 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -303,10 +303,30 @@ source "package/qtopia4/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"
+endif
+if BR2_PACKAGE_XSERVER_tinyx
 source "package/tinyx/Config.in"
+endif
+
 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/cairo/Config.in"
 source "package/pango/Config.in"

diff --git a/package/tinyx/Config.in b/package/tinyx/Config.in
index 2a9bbbf3f4a3b616a492dfd91e59b0bf5bab53d6..6b240776b9d2c7b6ae2731effdc8c1c7c4effe0c 100644 (file)
--- a/package/tinyx/Config.in
+++ b/package/tinyx/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_TINYX
        bool "tinyx"
-       default n
+       default y if BR2_PACKAGE_XSERVER_tinyx
        help
          A tiny X server.  Also known as 'Xfbdev' and 'kdrive'.

diff --git a/package/xorg/Config.in b/package/xorg/Config.in
index 7b35c1980e2cd0af35f438f58e5ae19a94f7c225..f868afdf12570090c5d6cd9fdea6223fa3fe18ef 100644 (file)
--- a/package/xorg/Config.in
+++ b/package/xorg/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_XORG
        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_LIBPNG
        select BR2_PACKAGE_EXPAT