Index: config/cf/X11.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
retrieving revision 1.41
diff -u -u -r1.41 X11.tmpl
--- config/cf/X11.tmpl	1 Feb 2005 04:06:03 -0000	1.41
+++ config/cf/X11.tmpl	18 Feb 2005 12:10:21 -0000
@@ -418,13 +418,15 @@
 #endif
 #ifndef BuildXKBlib
 #define BuildXKBlib		(BuildXKB && (!BuildServersOnly || \
-					      XnestServer || XdmxServer))
+					      XnestServer || XdmxServer || \
+					      BuildXkbcomp ))
 #endif
 #ifndef BuildXKBuilib
 #define BuildXKBuilib		(BuildXKB && !BuildServersOnly)
 #endif
 #ifndef BuildXKBfilelib
-#define BuildXKBfilelib		(BuildXKB && !BuildServersOnly)
+#define BuildXKBfilelib		(BuildXKB && (!BuildServersOnly || \
+					      BuildXkbcomp ))
 #endif
 #ifndef BuildXTrap
 #define BuildXTrap		YES
@@ -691,6 +693,10 @@
 #define BuildXterm		NO
 #endif
 
+#ifndef BuildXkbcomp
+#define BuildXkbcomp		BuildClients
+#endif
+
 #ifndef BuildXcursorLibrary
 #define BuildXcursorLibrary	BuildRenderLibrary
 #endif
Index: programs/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Imakefile,v
--- programs/Imakefile	31 Oct 2004 02:14:05 -0000	1.11
+++ programs/Imakefile	18 Feb 2005 12:10:42 -0000
@@ -13,6 +13,9 @@
 #if BuildServer
         XSSRCDIR = Xserver
 #endif
+#if BuildXkbcomp
+      XKBCOMPDIR = xkbcomp
+#endif
 #ifndef Win32Architecture
 #if HasXServer
      XINITSRCDIR = xinit
@@ -21,7 +24,7 @@
        XFSSRCDIR = xfs
 #endif
 #if BuildXKBlib
-      XKBSRCDIRS = setxkbmap xkbcomp xkbevd xkbprint xkbutils
+      XKBSRCDIRS = setxkbmap $(XKBCOMPDIR) xkbevd xkbprint xkbutils
 #endif
 #if BuildScreenSaverLibrary
 SCREENSAVESRCDIR = beforelight
@@ -64,7 +67,7 @@
      XTERMSRCDIR = xterm
 #endif
       SCRIPTSDIR = scripts
-#endif
+#endif /* Win32Architecture */
 #if BuildCID
      MKCFMSRCDIR = mkcfm
 #endif
@@ -130,7 +133,7 @@
 #endif
 
 #if BuildServersOnly || !BuildClients
-SUBDIRS = $(XSSRCDIR)
+SUBDIRS = $(XSSRCDIR) $(XKBCOMPDIR)
 #else
 SUBDIRS = \
 	appres bdftopcf bitmap \