xserver: Branch 'master'

[Brian Paul]

 hw/dmx/Makefile.am |    4 ++++
 1 files changed, 4 insertions(+)

New commits:
diff-tree 945b7c63946f5257d0f9b0dcf2f8f4882fb2c6f8 (from 891e9c3e6cbd0869a57395b96c8e18ff522c2bb4)
Author: Brian <brian at yutani.localnet.net>
Date:   Sat Sep 23 10:35:25 2006 -0600

    The fbcmap.c file used by Xdmx _must_ be compiled with XFree86Server defined.
    Otherwise, Xdmx generates a slew of protocol errors.

diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index d36647b..89136b9 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -16,6 +16,9 @@ GLX_INCS = -I$(top_srcdir)/hw/xfree86/di
 GLX_DEFS = @GL_CFLAGS@ 
 endif
 
+# It's essential that fbcmap.c be compiled with this flag for DMX to work!!
+DMX_CFLAGS = -DXFree86Server=1
+
 if BUILDDOCS
 SUBDIRS += doc
 endif
@@ -86,6 +89,7 @@ Xdmx_CFLAGS = \
               $(DIX_CFLAGS) \
               $(GLX_INCS) \
               $(GLX_DEFS) \
+              $(DMX_CFLAGS) \
               @DMXMODULES_CFLAGS@
 
 # Man page