Index: config/cf/X11.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
retrieving revision 1.10
diff -u -r1.10 X11.tmpl
--- config/cf/X11.tmpl	16 Jun 2004 09:46:14 -0000	1.10
+++ config/cf/X11.tmpl	21 Jun 2004 15:18:24 -0000
@@ -638,6 +638,10 @@
 #define BuildDamageLibrary	!BuildServersOnly
 #endif
 
+#ifndef BuildXterm
+#define BuildXterm		BuildClients
+#endif
+
 #ifndef BuildXcursorLibrary
 #define BuildXcursorLibrary	BuildRenderLibrary
 #endif
Index: programs/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Imakefile,v
retrieving revision 1.4
diff -u -r1.4 Imakefile
--- programs/Imakefile	16 Jun 2004 09:47:21 -0000	1.4
+++ programs/Imakefile	21 Jun 2004 15:18:24 -0000
@@ -60,7 +60,9 @@
        XRXSRCDIR = xrx
 #endif
        XSMSRCDIR = xsm
+#if BuildXterm
      XTERMSRCDIR = xterm
+#endif
       SCRIPTSDIR = scripts
 #endif
 #if BuildCID