summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/Config.in22
-rw-r--r--package/tinyx/Config.in2
-rw-r--r--package/xorg/Config.in3
3 files changed, 23 insertions, 4 deletions
diff --git a/package/Config.in b/package/Config.in
index c4368ded0..c0db11b8d 100644
--- 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 2a9bbbf3f..6b240776b 100644
--- 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 7b35c1980..f868afdf1 100644
--- 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