Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.458
diff -u -2 -0 -r1.458 ChangeLog
--- xc/ChangeLog	13 Oct 2004 22:14:22 -0000	1.458
+++ xc/ChangeLog	13 Oct 2004 22:45:48 -0000
@@ -1,20 +1,25 @@
+2004-10-13 Roland Mainz <roland.mainz@nrubsig.org>
+        * xc/programs/Imakefile
+        Bugzilla #1372: Fix build busatge in Broadway/XRX code when
+        Xaw8 is not available.
+
 2004-10-13  Adam Jackson  <ajax@freedesktop.org>
 
 	* programs/xdm/sessreg.c:
 	Bug #1627: Zero out struct utmp before writing it to prevent garbage
 	fields.  (Egmont Koblinger)
 
 2004-10-13  Alexander Gottwald  <ago@freedesktop.org>
 
 	* config/cf/Imakefile:
 	Bugzilla #1621, Bugzilla #1393: Add xorgversion.def to files to 
 	install
 
 2004-10-13  Eric Anholt  <anholt@FreeBSD.org>
 
 	* lib/X11/UIThrStubs.c:
 	Use attributes instead of pragmas for weak symbols on gcc 2.95 as well.
 	Using pragmas may result in the symbols being undefined with big -O.
 	(FreeBSD ports/69708, Masakazu HIGAKI <higamasa@dream.com>)
 
 2004-10-12 Roland Mainz <roland.mainz@nrubsig.org>
Index: xc/programs/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Imakefile,v
retrieving revision 1.8
diff -u -2 -0 -r1.8 Imakefile
--- xc/programs/Imakefile	2 Sep 2004 01:10:29 -0000	1.8
+++ xc/programs/Imakefile	13 Oct 2004 22:46:03 -0000
@@ -39,41 +39,41 @@
   LBXPROXYSRCDIR = lbxproxy
 #endif
 #if BuildXprintClients
   XPSRCDIRS = xplsprinters xprehashprinterlist xphelloworld
 #endif
   PROXYMGRSRCDIR = proxymngr
     RSTARTSRCDIR = rstart
    SMPROXYSRCDIR = smproxy
        TWMSRCDIR = twm
   XCONSOLESRCDIR = xconsole
        XDMSRCDIR = xdm
 XFINDPROXYSRCDIR = xfindproxy
       XFWPSRCDIR = xfwp
 #if BuildXF86VidModeLibrary
     XGAMMASRCDIR = xgamma
 #endif
 #if BuildXvLibrary
     XVINFOSRCDIR = xvinfo
 #endif
      XHOSTSRCDIR = xhost
-#if BuildPlugin
+#if BuildPlugin && BuildXaw
        XRXSRCDIR = xrx
 #endif
        XSMSRCDIR = xsm
 #if BuildXterm
      XTERMSRCDIR = xterm
 #endif
       SCRIPTSDIR = scripts
 #endif
 #if BuildCID
      MKCFMSRCDIR = mkcfm
 #endif
 
 #if (HasFreetype2 || BuildFreetype2Library) && BuildFontEncLib
   MKFONTSCALEDIR = mkfontscale
 #endif
 
 #if BuildXInputLib
 XINPUTCLIENTDIRS = xsetmode xsetpointer
 #endif