* xorg keyboard extensions

	 - adding parts of Gilbert's patch
	 - adding additional changes to avoid breaking other projects


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6319 33e552b5-05e3-0310-8538-816dae2090ed

8 files changed, 43 insertions, 14 deletions

diff --git a/CREDITS b/CREDITS
index 8f09b7839..1a56e2de3 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,4 +1,4 @@
-N: David R Bacon 
+N: David R Bacon
 E: dbacon@cis.ksu.edu
 D: Developer
 
@@ -14,7 +14,7 @@ S: Germany
 N: Milan-Dinkar Bobde
 E: bobde@usc.edu
 D: Developer
-S: Ixia Corp. 
+S: Ixia Corp.
 
 N: Alessio Igor Bogani
 E: abogani@texware.it
@@ -41,7 +41,7 @@ N: Vince Chen
 E: chen@glimmerglass.com
 D: Developer
 
-N: Sascha Hauer 
+N: Sascha Hauer
 E: s.hauer@pengutronix.de
 W: http://www.pengutronix.de
 D: Maintainer
@@ -70,7 +70,7 @@ D: Developer
 N: Dan Kegel
 E: dank@kegel.com
 D: Developer
-S: Ixia Corp. 
+S: Ixia Corp.
 
 N: Shahar Livne
 E: livnes@gmail.com
@@ -83,7 +83,7 @@ D: Developer
 N: Jiri Nesladek
 D: Developer
 
-N: Oscar Peredo 
+N: Oscar Peredo
 E: oscar@exis.cl
 D: Developer
 
@@ -99,7 +99,7 @@ N: Ulf Samuelsson
 E: ulf@atmel.com
 D: Developer
 
-N: Werner Schmitt 
+N: Werner Schmitt
 E: mail2ws@gmx.de
 D: Developer
 
@@ -110,7 +110,7 @@ D: Debugger, Head of Unlogical Code Department
 N: Robert Schwebel
 E: r.schwebel@pengutronix.de
 W: http://www.pengutronix.de
-D: Project Leader, Maintainer, Release Manager 
+D: Project Leader, Maintainer, Release Manager
 S: Pengutronix
 S: Hannoversche Strasse 2
 S: 31134 Hildesheim
@@ -128,7 +128,7 @@ N: Rex Tsai
 E: chihchun@debian.org.tw
 D: Developer
 
-N: David Updegraff 
+N: David Updegraff
 E: dave@cray.com
 D: Developer
 
@@ -140,7 +140,18 @@ N: Mike Wakerly
 E: mike.wakerly@gmail.com
 D: Developer
 
-N: Gilad Ben-Yossef 
+N: Gilad Ben-Yossef
 E: gilad@codefidence.com
 D: Developer
 
+N: Juergen Beisert
+E: j.beisert@pengutronix.de
+W: http://www.pengutronix.de
+D: Maintainer
+S: Pengutronix
+S: Hannoversche Strasse 2
+S: 31134 Hildesheim
+S: Germany
+
+N: Gilbert Forkel
+E: gilbert@ulixes.erlangen.ccc.de
diff --git a/rules/xorg-app-xkbcomp.in b/rules/xorg-app-xkbcomp.in
index 2a5a422ae..6069b6a0f 100644
--- a/rules/xorg-app-xkbcomp.in
+++ b/rules/xorg-app-xkbcomp.in
@@ -4,9 +4,11 @@ config XORG_APP_XKBCOMP
 	depends on XORG_KEYBOARD_MAPPING_SUPPORT
 	prompt "xorg xkbcomp"
 	select XORG_DATA_XKBDATA
+	select XORG_LIB_X11_XKB
 	default n
 	help
 	  Compiles XKB keyboard descriptions. This tool is needed
 	  to load new keyboard mappings into a running X server.
 	  If you have trouble to configure a special keyboard mapping, enable
-	  this tool for your target.
\ No newline at end of file
+	  this tool for your target.
+
diff --git a/rules/xorg-lib-X11.in b/rules/xorg-lib-X11.in
index 3e45862c7..2c8dc6e5f 100644
--- a/rules/xorg-lib-X11.in
+++ b/rules/xorg-lib-X11.in
@@ -39,3 +39,13 @@ config XORG_LIB_X11_CURSOR
 	default n
 	help
 	  FIXME
+
+config XORG_LIB_X11_XKB
+	depends on XORG_LIB_X11
+	bool
+	prompt "XKB Support"
+	default n
+	help
+         This adds the keyboard extension support to the base library. Various
+         applications handling keyboards need it.
+
diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make
index 0f9350232..642e25cda 100644
--- a/rules/xorg-lib-X11.make
+++ b/rules/xorg-lib-X11.make
@@ -96,7 +96,7 @@ endif
 #
 # feature is marked as experimental if disabled!
 #
-ifdef PTXCONF_XORG_APP_XKBCOMP
+ifdef PTXCONF_XORG_LIB_X11_XKB
 XORG_LIB_X11_AUTOCONF	+= --enable-xkb
 else
 XORG_LIB_X11_AUTOCONF	+= --disable-xkb
diff --git a/rules/xorg-lib-Xpm.make b/rules/xorg-lib-Xpm.make
index 52e41c9a0..cb91f1184 100644
--- a/rules/xorg-lib-Xpm.make
+++ b/rules/xorg-lib-Xpm.make
@@ -2,7 +2,7 @@
 # $Id: template 4565 2006-02-10 14:23:10Z mkl $
 #
 # Copyright (C) 2006 by Erwin Rol
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -64,7 +64,8 @@ XORG_LIB_XPM_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_LIB_XPM_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_LIB_XPM_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+	--disable-dependency-tracking
 
 $(STATEDIR)/xorg-lib-Xpm.prepare: $(xorg-lib-Xpm_prepare_deps_default)
 	@$(call targetinfo, $@)
diff --git a/rules/xorg-lib-Xt.make b/rules/xorg-lib-Xt.make
index 1c9e3c1ea..3ff85f85f 100644
--- a/rules/xorg-lib-Xt.make
+++ b/rules/xorg-lib-Xt.make
@@ -69,7 +69,7 @@ XORG_LIB_XT_AUTOCONF := $(CROSS_AUTOCONF_USR) \
 	--disable-install-makestrs \
 	--disable-dependency-tracking
 
-ifdef PTXCONF_XORG_KEYBOARD_MAPPING_SUPPORT
+ifdef PTXCONF_XORG_LIB_X11_XKB
 XORG_LIB_XT_AUTOCONF += --enable-xkb
 else
 XORG_LIB_XT_AUTOCONF += --disable-xkb
diff --git a/rules/xorg-lib-xkbfile.in b/rules/xorg-lib-xkbfile.in
index 7651939fe..263f0891f 100644
--- a/rules/xorg-lib-xkbfile.in
+++ b/rules/xorg-lib-xkbfile.in
@@ -1,7 +1,9 @@
 config XORG_LIB_XKBFILE
 	bool
 	prompt "libxkbfile"
+	select XORG_LIB_X11_XKB
 	select XORG_LIB_X11
 	select XORG_PROTO_KB
 	help
 	  The xkbfile Library
+
diff --git a/rules/xorg-server.in b/rules/xorg-server.in
index 8bb9b31dd..c573d46a3 100644
--- a/rules/xorg-server.in
+++ b/rules/xorg-server.in
@@ -225,6 +225,9 @@ config XORG_SERVER_OPT_SECURE_RPC
 
 config XORG_SERVER_OPT_XORGCFG
 	depends on XORG_SERVER
+	select XORG_LIB_XKBUI
+	select XORG_LIB_XXF86MISC
+	select XORG_LIB_XAW_V7
 	bool
 	prompt "build xorgcfg GUI config utility"
 	default n