Attachment 4087 Details for Bug 5332 – xorg-server-0.99.3-0.99.4.diff

[patch] xorg-server-0.99.3-0.99.4.diff

xorg-server-0.99.3-0.99.4.diff (text/plain), 237.92 KB, created by Donnie Berkholz on 2005-12-15 15:13:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Donnie Berkholz

Created: 2005-12-15 15:13:39 UTC

Size: 237.92 KB

patch

obsolete

>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/afb/Makefile.am xorg-server-0.99.4/afb/Makefile.am
>--- xorg-server-0.99.3/afb/Makefile.am	2005-10-05 14:38:40.000000000 -0700
>+++ xorg-server-0.99.4/afb/Makefile.am	2005-12-01 22:02:39.000000000 -0800
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libafb.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> libafb_gen_sources = afbbltC.c afbbltX.c afbbltCI.c afbbltO.c afbbltG.c afbtileC.c afbtileG.c afbseg.c
> 
>@@ -12,7 +12,7 @@
> 	 afbclip.c afbgetsp.c afbpolypnt.c afbbitblt.c afbcmap.c afbimggblt.c afbpntarea.c \
> 	 afbmisc.c afbbstore.c afbtegblt.c $(libafb_gen_sources)
> 
>-INCLUDES = -I$(top_srcdir)/mfb
>+INCLUDES = -I$(top_srcdir)/mfb -I$(top_srcdir)/hw/xfree86/os-support
> 
> EXTRA_DIST = afbline.c afbblt.c afbtile.c README Xdaniver.doc
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/cfb/Makefile.am xorg-server-0.99.4/cfb/Makefile.am
>--- xorg-server-0.99.3/cfb/Makefile.am	2005-10-05 14:38:40.000000000 -0700
>+++ xorg-server-0.99.4/cfb/Makefile.am	2005-12-01 22:02:39.000000000 -0800
>@@ -9,9 +9,9 @@
> 
> libcfb_la_LIBADD = ../mfb/libmfb.la
> 
>-AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS)
>+AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
>-INCLUDES = $(CFB_INCLUDES)
>+INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
> 
> EXTRA_DIST = cfbline.c cfbfillarc.c cfbzerarc.c cfbblt.c cfbsolid.c \
>              cfbtileodd.c cfbtile32.c cfb8line.c cfbply1rct.c cfbglblt8.c \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/cfb16/Makefile.am xorg-server-0.99.4/cfb16/Makefile.am
>--- xorg-server-0.99.3/cfb16/Makefile.am	2005-07-02 11:59:24.000000000 -0700
>+++ xorg-server-0.99.4/cfb16/Makefile.am	2005-12-01 22:02:39.000000000 -0800
>@@ -4,6 +4,6 @@
> 
> libcfb16_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
> 
>-INCLUDES = $(CFB_INCLUDES)
>+INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
> 
>-AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS)
>+AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/cfb24/Makefile.am xorg-server-0.99.4/cfb24/Makefile.am
>--- xorg-server-0.99.3/cfb24/Makefile.am	2005-07-02 11:59:25.000000000 -0700
>+++ xorg-server-0.99.4/cfb24/Makefile.am	2005-12-01 22:02:39.000000000 -0800
>@@ -5,7 +5,7 @@
> libcfb24_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
> 
> EXTRA_DIST = cfbrrop24.h
>-	
>-AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS)
> 
>-INCLUDES = $(CFB_INCLUDES)
>+AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
>+INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/cfb32/Makefile.am xorg-server-0.99.4/cfb32/Makefile.am
>--- xorg-server-0.99.3/cfb32/Makefile.am	2005-07-02 11:59:25.000000000 -0700
>+++ xorg-server-0.99.4/cfb32/Makefile.am	2005-12-01 22:02:39.000000000 -0800
>@@ -4,6 +4,6 @@
> 
> libcfb32_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
> 
>-INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS)
>+INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support
> 
>-AM_CFLAGS = -DPSZ=32
>+AM_CFLAGS = -DPSZ=32 @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/ChangeLog xorg-server-0.99.4/ChangeLog
>--- xorg-server-0.99.3/ChangeLog	2005-11-09 23:46:03.000000000 -0800
>+++ xorg-server-0.99.4/ChangeLog	2005-12-03 09:04:44.000000000 -0800
>@@ -1,3 +1,324 @@
>+2005-12-03  Alan Coopersmith  <alan.coopersmith@sun.com>
>+
>+	* xorg/Makefile.am:
>+	* xorg/configure.ac:
>+	* xorg/hw/xfree86/Makefile.am:
>+	* hw/xfree86/dixmods/Makefile.am: 
>+	Bugzilla #4809 <https://bugs.freedesktop.org/show_bug.cgi?id=4809>
>+	Patch #3908 <https://bugs.freedesktop.org/attachment.cgi?id=3908>
>+	xf8_32wid and cfb24 only need to be built on sparc
>+
>+2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
>+
>+	* configure.ac:
>+	Update package version number for X11R7 RC3 release.
>+	Update release string to 6.99.99.903 (i.e., 7.0 RC3).
>+
>+2005-12-02  Kevin E. Martin  <kem-at-freedesktop-dot-org>
>+
>+	* GL/glx/Makefile.am:
>+	* GL/mesa/X/Makefile.am:
>+	* GL/mesa/array_cache/Makefile.am:
>+	* GL/mesa/glapi/Makefile.am:
>+	* GL/mesa/main/Makefile.am:
>+	* GL/mesa/math/Makefile.am:
>+	* GL/mesa/shader/Makefile.am:
>+	* GL/mesa/shader/grammar/Makefile.am:
>+	* GL/mesa/shader/slang/Makefile.am:
>+	* GL/mesa/swrast/Makefile.am:
>+	* GL/mesa/swrast_setup/Makefile.am:
>+	* GL/mesa/tnl/Makefile.am:
>+	* XTrap/Makefile.am:
>+	* Xext/Makefile.am:
>+	* Xi/Makefile.am:
>+	* Xprint/Makefile.am:
>+	* Xprint/pcl/Makefile.am:
>+	* Xprint/ps/Makefile.am:
>+	* Xprint/raster/Makefile.am:
>+	* afb/Makefile.am:
>+	* cfb/Makefile.am:
>+	* cfb16/Makefile.am:
>+	* cfb24/Makefile.am:
>+	* cfb32/Makefile.am:
>+	* composite/Makefile.am:
>+	* configure.ac:
>+	* damageext/Makefile.am:
>+	* dbe/Makefile.am:
>+	* dix/Makefile.am:
>+	* fb/Makefile.am:
>+	* hw/dmx/Makefile.am:
>+	* hw/dmx/config/Makefile.am:
>+	* hw/dmx/glxProxy/Makefile.am:
>+	* hw/dmx/input/Makefile.am:
>+	* hw/vfb/Makefile.am:
>+	* hw/xfree86/Makefile.am:
>+	* hw/xfree86/common/Makefile.am:
>+	* hw/xfree86/ddc/Makefile.am:
>+	* hw/xfree86/dixmods/Makefile.am:
>+	* hw/xfree86/dixmods/extmod/Makefile.am:
>+	* hw/xfree86/dri/Makefile.am:
>+	* hw/xfree86/dummylib/Makefile.am:
>+	* hw/xfree86/exa/Makefile.am:
>+	* hw/xfree86/fbdevhw/Makefile.am:
>+	* hw/xfree86/i2c/Makefile.am:
>+	* hw/xfree86/int10/Makefile.am:
>+	* hw/xfree86/loader/Makefile.am:
>+	* hw/xfree86/os-support/bsd/Makefile.am:
>+	* hw/xfree86/os-support/bus/Makefile.am:
>+	* hw/xfree86/os-support/drm/Makefile.am:
>+	* hw/xfree86/os-support/linux/Makefile.am:
>+	* hw/xfree86/os-support/misc/Makefile.am:
>+	* hw/xfree86/os-support/solaris/Makefile.am:
>+	* hw/xfree86/parser/Makefile.am:
>+	* hw/xfree86/rac/Makefile.am:
>+	* hw/xfree86/ramdac/Makefile.am:
>+	* hw/xfree86/scanpci/Makefile.am:
>+	* hw/xfree86/shadowfb/Makefile.am:
>+	* hw/xfree86/utils/xorgcfg/Makefile.am:
>+	* hw/xfree86/utils/xorgconfig/Makefile.am:
>+	* hw/xfree86/vbe/Makefile.am:
>+	* hw/xfree86/vgahw/Makefile.am:
>+	* hw/xfree86/x86emu/Makefile.am:
>+	* hw/xfree86/xaa/Makefile.am:
>+	* hw/xfree86/xf1bpp/Makefile.am:
>+	* hw/xfree86/xf4bpp/Makefile.am:
>+	* hw/xfree86/xf8_16bpp/Makefile.am:
>+	* hw/xfree86/xf8_32bpp/Makefile.am:
>+	* hw/xfree86/xf8_32wid/Makefile.am:
>+	* hw/xnest/Makefile.am:
>+	* include/xorg-config.h.in:
>+	* include/xorg-server.h.in:
>+	* include/xwin-config.h.in:
>+	* lbx/Makefile.am:
>+	* mfb/Makefile.am:
>+	* mi/Makefile.am:
>+	* miext/cw/Makefile.am:
>+	* miext/damage/Makefile.am:
>+	* miext/layer/Makefile.am:
>+	* miext/shadow/Makefile.am:
>+	* os/Makefile.am:
>+	* randr/Makefile.am:
>+	* record/Makefile.am:
>+	* render/Makefile.am:
>+	* xfixes/Makefile.am:
>+	* xkb/Makefile.am:
>+	* xorg-server.pc.in:
>+	Define XFree86Server only where it is required.
>+
>+2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
>+
>+	* GL/mesa/X/Makefile.am:
>+	Fix GL build when srcdir != builddir (Donnie Berkholz).
>+
>+2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
>+
>+	* configure.ac:
>+	* include/dix-config.h.in:
>+	* include/xorg-server.h.in:
>+	Add missing XvExtension and XvMCExtension defines.
>+
>+2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
>+
>+	* configure.ac:
>+	Fix typo: xorg_bus_linuxbsdpci ==> xorg_bus_linuxpci
>+
>+2005-11-30  Eric Anholt  <anholt@FreeBSD.org>
>+
>+	* configure.ac:
>+	* hw/xfree86/os-support/bus/Makefile.am:
>+	Bug #5160: Fix the modular build to try to use the same logic for
>+	choosing the architecture/os-specific bus support as monolithic.
>+
>+2005-11-29  Adam Jackson  <ajax@freedesktop.org>
>+
>+	* configure.ac:
>+	Only build dlloader modules by default.
>+
>+2005-11-29  Kevin E. Martin  <kem-at-freedesktop-dot-org>
>+
>+	* GL/glx/Makefile.am:
>+	* GL/mesa/X/Makefile.am:
>+	* GL/mesa/array_cache/Makefile.am:
>+	* GL/mesa/glapi/Makefile.am:
>+	* GL/mesa/main/Makefile.am:
>+	* GL/mesa/math/Makefile.am:
>+	* GL/mesa/shader/Makefile.am:
>+	* GL/mesa/shader/grammar/Makefile.am:
>+	* GL/mesa/shader/slang/Makefile.am:
>+	* GL/mesa/swrast/Makefile.am:
>+	* GL/mesa/swrast_setup/Makefile.am:
>+	* GL/mesa/tnl/Makefile.am:
>+	* GL/symlink-mesa.sh:
>+	* XTrap/Makefile.am:
>+	* Xext/Makefile.am:
>+	* Xi/Makefile.am:
>+	* afb/Makefile.am:
>+	* cfb/Makefile.am:
>+	* cfb16/Makefile.am:
>+	* cfb24/Makefile.am:
>+	* cfb32/Makefile.am:
>+	* composite/Makefile.am:
>+	* configure.ac:
>+	* damageext/Makefile.am:
>+	* dbe/Makefile.am:
>+	* dix/Makefile.am:
>+	* fb/Makefile.am:
>+	* hw/dmx/glxProxy/Makefile.am:
>+	* hw/xfree86/Makefile.am:
>+	* hw/xfree86/common/Makefile.am:
>+	* hw/xfree86/ddc/Makefile.am:
>+	* hw/xfree86/dixmods/Makefile.am:
>+	* hw/xfree86/dixmods/extmod/Makefile.am:
>+	* hw/xfree86/dri/Makefile.am:
>+	* hw/xfree86/dummylib/Makefile.am:
>+	* hw/xfree86/exa/Makefile.am:
>+	* hw/xfree86/fbdevhw/Makefile.am:
>+	* hw/xfree86/i2c/Makefile.am:
>+	* hw/xfree86/int10/Makefile.am:
>+	* hw/xfree86/loader/Makefile.am:
>+	* hw/xfree86/os-support/bsd/Makefile.am:
>+	* hw/xfree86/os-support/bus/Makefile.am:
>+	* hw/xfree86/os-support/drm/Makefile.am:
>+	* hw/xfree86/os-support/linux/Makefile.am:
>+	* hw/xfree86/os-support/misc/Makefile.am:
>+	* hw/xfree86/os-support/solaris/Makefile.am:
>+	* hw/xfree86/parser/Makefile.am:
>+	* hw/xfree86/rac/Makefile.am:
>+	* hw/xfree86/ramdac/Makefile.am:
>+	* hw/xfree86/scanpci/Makefile.am:
>+	* hw/xfree86/shadowfb/Makefile.am:
>+	* hw/xfree86/utils/xorgcfg/Makefile.am:
>+	* hw/xfree86/vbe/Makefile.am:
>+	* hw/xfree86/vgahw/Makefile.am:
>+	* hw/xfree86/x86emu/Makefile.am:
>+	* hw/xfree86/xaa/Makefile.am:
>+	* hw/xfree86/xf1bpp/Makefile.am:
>+	* hw/xfree86/xf4bpp/Makefile.am:
>+	* hw/xfree86/xf8_16bpp/Makefile.am:
>+	* hw/xfree86/xf8_32bpp/Makefile.am:
>+	* hw/xfree86/xf8_32wid/Makefile.am:
>+	* include/xorg-config.h.in:
>+	* lbx/Makefile.am:
>+	* mfb/Makefile.am:
>+	* mi/Makefile.am:
>+	* miext/cw/Makefile.am:
>+	* miext/damage/Makefile.am:
>+	* miext/layer/Makefile.am:
>+	* miext/shadow/Makefile.am:
>+	* os/Makefile.am:
>+	* randr/Makefile.am:
>+	* record/Makefile.am:
>+	* render/Makefile.am:
>+	* xfixes/Makefile.am:
>+	* xkb/Makefile.am:
>+	* xorg-server.pc.in:
>+	Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update
>+	loadable module builds to reflect this change.
>+
>+2005-11-23  Kevin E. Martin  <kem-at-freedesktop-dot-org>
>+
>+	* configure.ac:
>+	* hw/xfree86/Makefile.am:
>+	* hw/xfree86/parser/Makefile.am:
>+	* hw/xfree86/utils/xorgcfg/Makefile.am:
>+	Add configure option to install libxf86config.a (disabled by
>+	default).
>+
>+2005-11-21  Eric Anholt  <anholt@FreeBSD.org>
>+
>+	* hw/xfree86/utils/ioport/Makefile.am:
>+	Bug #5118: Use "rm -f" instead of "$(RM)", which isn't always defined.
>+
>+2005-11-20  Felix Kuehling  <fxkuehl@gmx.de>
>+
>+	* configure.ac:
>+	Fix Xprt library dependencies in the case that Xprint is
>+	auto-detected by configure.
>+
>+2005-11-20  Alan Coopersmith  <alan.coopersmith@sun.com>
>+
>+	* configure.ac: 
>+	* xkb/Makefile.am:
>+	Make sure XKM_OUTPUT_DIR (used in code) ends in / (so paths don't
>+	get hosed when appending file names) but XKB_COMPILED_DIR (used 
>+	in Makefiles) does not so install-sh -d doesn't get confused when
>+	the directory already exists.
>+
>+2005-11-19  Alan Coopersmith  <alan.coopersmith@sun.com>
>+
>+	* configure.ac: 
>+	Add xext to list of modules xorgcfg depends on.
>+
>+2005-11-19  Kevin E. Martin  <kem-at-freedesktop-dot-org>
>+
>+	* GL/glx/Makefile.am:
>+	* Xprint/Makefile.am:
>+	* Xprint/pcl/Makefile.am:
>+	* Xprint/ps/Makefile.am:
>+	* Xprint/raster/Makefile.am:
>+	* configure.ac:
>+	* hw/xfree86/utils/xorgconfig/Makefile.am:
>+	* xorg-server.pc.in:
>+	Update dependencies to work with separate build roots.
>+
>+2005-11-18  Adam Jackson  <ajax@freedesktop.org>
>+
>+	* hw/xfree86/os-support/linux/Makefile.am:
>+	Bug #4928: Unbreak Makefile.am for Alpha chips. (Stefan DeRoeck)
>+
>+	* configure.ac:
>+	* hw/xfree86/dixmods/Makefile.am:
>+	Bug #4824: Build XTrap support by default, matching monolith.
>+
>+2005-11-16  Adam Jackson  <ajax@freedesktop.org>
>+
>+	* configure.ac:
>+	Fix builds when not building the Xorg DDX.
>+
>+2005-11-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
>+
>+	* GL/glx/glcontextmodes.c:
>+	* GL/glx/glcontextmodes.h:
>+	* GL/symlink-mesa.sh:
>+	Use glcontextmodes.[ch] from Mesa.
>+
>+2005-11-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
>+
>+	* GL/glx/Makefile.am:
>+	Add GL_CFLAGS so that GLX can find its proto headers when using
>+	separate build dirs.
>+
>+2005-11-13  Alan Coopersmith  <alan.coopersmith@sun.com>
>+
>+	* configure.ac: 
>+	Default xkb-output directory needs trailing slash.
>+
>+2005-11-13  Alan Coopersmith  <alan.coopersmith@sun.com>
>+
>+	* Xprint/doc/Makefile.am:
>+	* hw/dmx/Makefile.am:
>+	* hw/dmx/config/Makefile.am:
>+	* hw/vfb/Makefile.am:
>+	* hw/xfree86/doc/man/Makefile.am:
>+	* hw/xfree86/getconfig/Makefile.am:
>+	* hw/xfree86/utils/gtf/Makefile.am:
>+	* hw/xfree86/utils/kbd_mode/Makefile.am:
>+	* hw/xfree86/utils/pcitweak/Makefile.am:
>+	* hw/xfree86/utils/scanpci/Makefile.am:
>+	* hw/xfree86/utils/xorgcfg/Makefile.am:
>+	* hw/xfree86/utils/xorgconfig/Makefile.am:
>+	* hw/xnest/Makefile.am:
>+	* hw/xwin/Makefile.am:
>+	Bug #5019 <https://bugs.freedesktop.org/show_bug.cgi?id=5019>
>+	xserver installs manpages into 'man1' instead of 'man1x'
>+
>+2005-11-12  Alan Coopersmith  <alan.coopersmith@sun.com>
>+
>+	* include/dix-config.h.in: 
>+	Bug #4832 <https://bugs.freedesktop.org/show_bug.cgi?id=4832>
>+	use RGB_DB not RGB_PATH as that's what configure defines
>+	(JÃ¼rg Billeter  <j@bitron.ch>)
>+  
> 2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
> 
> 	* configure.ac:
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/composite/Makefile.am xorg-server-0.99.4/composite/Makefile.am
>--- xorg-server-0.99.3/composite/Makefile.am	2005-07-02 11:59:25.000000000 -0700
>+++ xorg-server-0.99.4/composite/Makefile.am	2005-12-01 22:02:39.000000000 -0800
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libcomposite.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> libcomposite_la_SOURCES = 	\
> 	compalloc.c		\
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/configure.ac xorg-server-0.99.4/configure.ac
>--- xorg-server-0.99.3/configure.ac	2005-11-09 23:46:04.000000000 -0800
>+++ xorg-server-0.99.4/configure.ac	2005-12-03 14:47:47.000000000 -0800
>@@ -1,4 +1,4 @@
>-dnl $Id: configure.ac,v 1.124 2005/11/10 04:59:21 kem Exp $
>+dnl $Id: configure.ac,v 1.140 2005/12/03 22:47:47 ajax Exp $
> dnl
> dnl Copyright Â© 2003-2005 Keith Packard, Daniel Stone
> dnl
>@@ -25,7 +25,7 @@
> AC_PREREQ(2.57)
> dnl This is the not the Xorg version number, it's the server version number.
> dnl Yes, that's weird.
>-AC_INIT([xorg-server], 0.99.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
>+AC_INIT([xorg-server], 0.99.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
> AC_CONFIG_SRCDIR([Makefile.am])
> AM_INIT_AUTOMAKE([dist-bzip2 foreign])
> AM_MAINTAINER_MODE
>@@ -52,6 +52,7 @@
> AC_PROG_INSTALL
> AC_PROG_LN_S
> AC_LIBTOOL_WIN32_DLL
>+AC_DISABLE_STATIC
> AC_PROG_LIBTOOL
> AC_PROG_MAKE_SET
> PKG_PROG_PKG_CONFIG
>@@ -165,9 +166,8 @@
> dnl hw/xfree86/os-support/bus/Makefile.am, among others.
> dnl ---------------------------------------------------------------------------
> DEFAULT_INT10="x86emu"
>-xorg_bus_sparc="no"
>-xorg_bus_ix86pci="no"
> use_x86_asm="no"
>+build_xf8_32wid="yes"
> 
> dnl Override defaults as needed for specific platforms:
> 
>@@ -182,17 +182,13 @@
> 	ARM_VIDEO=yes
> 	;;
>   i*86)
>-	xorg_bus_ix86pci="yes"
> 	use_x86_asm="yes"
> 	I386_VIDEO=yes
> 	case $host_os in
> 		*linux*)	DEFAULT_INT10=vm86 ;;
>-		*freebsd*)	xorg_bus_ix86pci="no"
>-				AC_DEFINE(USE_DEV_IO) ;;
>-		*netbsd*)	xorg_bus_ix86pci="no"
>-				AC_DEFINE(USE_I386_IOPL) ;;
>-		*openbsd*)	xorg_bus_ix86pci="no"
>-				AC_DEFINE(USE_I386_IOPL) ;;
>+		*freebsd*)	AC_DEFINE(USE_DEV_IO) ;;
>+		*netbsd*)	AC_DEFINE(USE_I386_IOPL) ;;
>+		*openbsd*)	AC_DEFINE(USE_I386_IOPL) ;;
> 	esac
>         ;;
>   powerpc*)
>@@ -202,13 +198,12 @@
> 	esac
> 	;;
>   sparc*)
>-	xorg_bus_sparc="yes"
>+	build_xf8_32wid="yes"   # used by sunffb driver
> 	xorg_loader_sparcmuldiv="yes"
> 	SPARC64_VIDEO=yes
> 	BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"
> 	;;
>   x86_64*|amd64*)
>-	xorg_bus_ix86pci="yes"
>   	use_x86_asm="yes"
> 	I386_VIDEO=yes
> 	case $host_os in
>@@ -219,6 +214,7 @@
> 	;;
> esac
> 
>+AM_CONDITIONAL(BUILD_XF8_32WID, [test x$build_xf8_32wid = xyes])
> 
> dnl BSD *_video.c selection
> AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
>@@ -274,8 +270,8 @@
> DEFAULT_VERSION_MAJOR=6
> DEFAULT_VERSION_MINOR=99
> DEFAULT_VERSION_PATCH=99
>-DEFAULT_VERSION_SNAP=902
>-DEFAULT_RELEASE_DATE="09 November 2005"
>+DEFAULT_VERSION_SNAP=903
>+DEFAULT_RELEASE_DATE="02 December 2005"
> DEFAULT_VENDOR_WEB="http://wiki.x.org"
> 
> m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
>@@ -360,14 +356,20 @@
> AC_ARG_ENABLE(builddocs,      AS_HELP_STRING([--enable-builddocs], [Build docs (default: disabled)]),
>                                 [BUILDDOCS=$enableval],
>                                 [BUILDDOCS=no])
>+AC_ARG_ENABLE(install-libxf86config,
>+				AS_HELP_STRING([--enable-install-libxf86config],
>+				[Install libxf86config (default: disabled)]),
>+				[INSTALL_LIBXF86CONFIG=$enableval],
>+				[INSTALL_LIBXF86CONFIG=no])
> 
> dnl Extensions.
> AC_ARG_ENABLE(composite,      AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes])
> AC_ARG_ENABLE(mitshm,         AS_HELP_STRING([--disable-shm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes])
> AC_ARG_ENABLE(xres,           AS_HELP_STRING([--disable-xres], [Build XRes extension (default: enabled)]), [RES=$enableval], [RES=yes])
>-AC_ARG_ENABLE(xtrap,          AS_HELP_STRING([--enable-xtrap], [Build XTrap extension (default: disabled)]), [XTRAP=$enableval], [XTRAP=no])
>+AC_ARG_ENABLE(xtrap,          AS_HELP_STRING([--disable-xtrap], [Build XTrap extension (default: enabled)]), [XTRAP=$enableval], [XTRAP=yes])
> AC_ARG_ENABLE(record,         AS_HELP_STRING([--disable-record], [Build Record extension (default: enabled)]), [RECORD=$enableval], [RECORD=yes])
> AC_ARG_ENABLE(xv,             AS_HELP_STRING([--disable-xv], [Build Xv extension (default: enabled)]), [XV=$enableval], [XV=yes])
>+AC_ARG_ENABLE(xvmc,           AS_HELP_STRING([--disable-xvmc], [Build XvMC extension (default: enabled)]), [XVMC=$enableval], [XVMC=yes])
> AC_ARG_ENABLE(dga,            AS_HELP_STRING([--disable-dga], [Build DGA extension (default: enabled)]), [DGA=$enableval], [DGA=yes])
> AC_ARG_ENABLE(screensaver,    AS_HELP_STRING([--disable-screensaver], [Build ScreenSaver extension (default: enabled)]), [SCREENSAVER=$enableval], [SCREENSAVER=yes])
> AC_ARG_ENABLE(xdmcp,          AS_HELP_STRING([--disable-xdmcp], [Build XDMCP extension (default: auto)]), [XDMCP=$enableval], [XDMCP=auto])
>@@ -451,19 +453,29 @@
> fi
> AM_CONDITIONAL(BUILDSGMLDOCS, test "x$LINUXDOC" != x)
> 
>+dnl Handle installing libxf86config
>+AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])
>+
> dnl ---------------------------------------------------------------------------
> dnl Extension section
> dnl ---------------------------------------------------------------------------
> XEXT_INC='-I$(top_srcdir)/Xext'
> XEXT_LIB='$(top_builddir)/Xext/libXext.la'
>+XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
> 
> dnl Core modules for most extensions, et al.
>-REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xcmiscproto xextproto xfont xproto xtrans xau xf86miscproto xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto resourceproto fontenc fontsproto inputproto xf86dgaproto"
>+REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto resourceproto fontsproto inputproto xf86dgaproto"
>+REQUIRED_LIBS="xfont xau fontenc"
> 
> AM_CONDITIONAL(XV, [test "x$XV" = xyes])
> if test "x$XV" = xyes; then
> 	AC_DEFINE(XV, 1, [Support Xv extension])
>+	AC_DEFINE(XvExtension, 1, [Build Xv extension])
> 	REQUIRED_MODULES="$REQUIRED_MODULES videoproto"
>+	AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes])
>+	if test "x$XVMC" = xyes; then
>+		AC_DEFINE(XvMCExtension, 1, [Build XvMC extension])
>+	fi
> fi
> 
> AM_CONDITIONAL(DGA, [test "x$DGA" = xyes])
>@@ -511,6 +523,8 @@
> fi
> 
> if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
>+	PKG_CHECK_MODULES([XLIB], [x11])
>+	AC_SUBST(XLIB_CFLAGS)
> 	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
> 	GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
> 	test -d GL || mkdir GL
>@@ -606,7 +620,7 @@
> fi
> 
> if test "x$XPRINT" = xauto; then
>-	PKG_CHECK_MODULES([XPRINT], [printproto], [XPRINT=yes], [XPRINT=no])
>+	PKG_CHECK_MODULES([XPRINTPROTO], [printproto], [XPRINT=yes], [XPRINT=no])
> fi
> AM_CONDITIONAL(XPRINT, [test "x$XPRINT" = xyes])
> if test "x$XPRINT" = xyes; then
>@@ -672,7 +686,7 @@
> AM_CONDITIONAL(XDMCP, [test "x$XDMCP" = xyes])
> if test "x$XDMCP" = xyes; then
> 	AC_DEFINE(XDMCP, 1, [Support XDM Control Protocol])
>-	REQUIRED_MODULES="$REQUIRED_MODULES xdmcp"
>+	REQUIRED_LIBS="$REQUIRED_LIBS xdmcp"
> 	XDMCP_MODULES="xdmcp"
> fi
> 
>@@ -680,7 +694,7 @@
> if test "x$XDMAUTH" = xyes; then
> 	AC_DEFINE(HASXDMAUTH,1,[Support XDM-AUTH*-1])
> 	if ! test "x$XDMCP" = xyes; then
>-		REQUIRED_MODULES="$REQUIRED_MODULES xdmcp"
>+		REQUIRED_LIBS="$REQUIRED_LIBS xdmcp"
> 		XDMCP_MODULES="xdmcp"
> 	fi
> fi
>@@ -739,6 +753,7 @@
> 
> DIX_LIB='$(top_builddir)/dix/libdix.la'
> OS_LIB='$(top_builddir)/os/libos.la'
>+CWRAP_LIB='$(top_builddir)/os/libcwrapper.la'
> MI_LIB='$(top_builddir)/mi/libmi.la'
> MINIMI_LIB='$(top_builddir)/mi/libminimi.la'
> MI_EXT_LIB='$(top_builddir)/mi/libmiext.la'
>@@ -751,8 +766,12 @@
> XPSTUBS_LIB='$(top_builddir)/dix/libxpstubs.la'
> CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
> 
>-PKG_CHECK_MODULES([XSERVER], [$REQUIRED_MODULES])
>-XSERVER_LIBS="${XSERVER_LIBS} -lm -lz"
>+PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS])
>+PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
>+
>+XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS}"
>+XSERVER_LIBS="${XSERVERLIBS_LIBS} -lm -lz"
>+AC_SUBST([XSERVER_LIBS])
> 
> 
> dnl Imake defines SVR4 on SVR4 systems, and many files check for it, so
>@@ -773,6 +792,10 @@
> dnl DDX section.
> dnl ---------------------------------------------------------------------------
> 
>+dnl These are used to define Xorg module, loader and general server defines
>+MODULE_DEFINES=""
>+LOADER_DEFINES=""
>+SERVER_DEFINES=""
> 
> dnl DMX DDX
> 
>@@ -790,7 +813,7 @@
> 		              modules not found.])
> 	fi
> 	DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC"
>-	XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $OS_LIB $MIEXT_SHADOW_LIB"
>+	XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $MIEXT_SHADOW_LIB $CWRAP_LIB $OS_LIB"
> 	AC_SUBST([XDMX_LIBS])
> 
> dnl USB sources in DMX require <linux/input.h>
>@@ -829,7 +852,7 @@
> AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
> 
> if test "x$XVFB" = xyes; then
>-	XVFB_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
>+	XVFB_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
> 	AC_SUBST([XVFB_LIBS])
> fi
> 
>@@ -845,7 +868,7 @@
> AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
> 
> if test "x$XNEST" = xyes; then
>-	XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
>+	XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
> 	AC_SUBST([XNEST_LIBS])
> fi
> 
>@@ -862,13 +885,24 @@
> fi
> AC_MSG_RESULT([$XORG])
> 
>+# XORG_CORE_LIBS is needed even if you're not building the Xorg DDX
>+XORG_CORE_LIBS="$DIX_LIB"
>+AC_SUBST([XORG_CORE_LIBS])
>+
>+xorg_bus_linuxpci=no
>+xorg_bus_freebsdpci=no
>+xorg_bus_netbsdpci=no
>+xorg_bus_ix86pci=no
>+xorg_bus_ppcpci=no
>+xorg_bus_sparcpci=no
>+xorg_bus_sparc=no
>+
> if test "x$XORG" = xyes; then
> 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
> 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
> 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
> 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
>-	XORG_CORE_LIBS="$DIX_LIB"
>-	XORG_LIBS="$MI_LIB $FIXES_LIB $XEXT_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
>+	XORG_LIBS="$MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
> 
> 	AC_CHECK_LIB([dl], [dlopen], XORG_LIBS="$XORG_LIBS -ldl")
> 
>@@ -877,6 +911,7 @@
> 	  	XORG_OS="linux"
> 		XORG_OS_SUBDIR="linux"
> 		XORG_OS_KBD="Lnx"
>+		xorg_bus_linuxpci="yes"
> 		case $host_cpu in
> 		  ia64*)
> 			linux_ia64=yes
>@@ -884,6 +919,7 @@
> 		  alpha*)
> 		  	linux_alpha=yes
> 			XORG_OS_PCI="axp"
>+			xorg_bus_linuxpci="no"
> 			;;
> 		  *)
> 			;;
>@@ -893,16 +929,37 @@
> 	  	XORG_OS="freebsd"
> 		XORG_OS_SUBDIR="bsd"
> 		XORG_OS_KBD="BSD"
>+		case $host_cpu in
>+		  i*86)
>+			;;
>+		  *)
>+			xorg_bus_freebsdpci="yes"
>+			;;
>+		esac
> 		;;
> 	  netbsd*)
> 	  	XORG_OS="netbsd"
> 		XORG_OS_SUBDIR="bsd"
> 		XORG_OS_KBD="BSD"
>+		case $host_cpu in
>+		  i*86|amd64*|x86_64*|ia64*)
>+			;;
>+		  *)
>+			xorg_bus_netbsdpci="yes"
>+			;;
>+		esac
> 		;;
> 	  openbsd*)
> 	  	XORG_OS="openbsd"
> 		XORG_OS_SUBDIR="bsd"
> 		XORG_OS_KBD="BSD"
>+		case $host_cpu in
>+		  i*86|amd64*|x86_64*|ia64*)
>+			;;
>+		  *)
>+			xorg_bus_freebsdpci="yes"
>+			;;
>+		esac
> 		;;
> 	  solaris*)
> 	  	XORG_OS="solaris"
>@@ -928,11 +985,9 @@
> 			
> 		case $host_cpu in
> 		  sparc*)	
>-			XORG_OS_PCI="sparc"
> 			SOLARIS_INOUT_ARCH="sparcv8plus"
> 			;;
> 		  i*86)	
>-			XORG_OS_PCI="ix86"
> 			if test x$SOLARIS_64 = xyes ; then
> 				SOLARIS_INOUT_ARCH="amd64"
> 			else
>@@ -961,16 +1016,44 @@
> 	        Xorg to your platform, please email xorg@lists.freedesktop.org.])
> 		;;
> 	esac
>+
>+	case $host_cpu in
>+	  i*86)
>+		xorg_bus_ix86pci=yes
>+		;;
>+	  powerpc*)
>+		case $host_os in
>+		  linux*|freebsd*|netbsd*|openbsd*)
>+			;;
>+		  *)
>+			xorg_bus_ppcpci="yes"
>+			;;
>+		esac
>+		;;
>+	  sparc*)
>+		xorg_bus_sparcpci="yes"
>+		xorg_bus_sparc="yes"
>+		;;
>+	  x86_64*|amd64*)
>+		case $host_os in
>+		  freebsd*)
>+			# FreeBSD uses the system pci interface
>+			;;
>+		  *)
>+			xorg_bus_ix86pci="yes"
>+			;;
>+		esac
>+		;;
>+	esac
>+
> 	if test "x$XORG_OS_PCI" = x ; then
> 		XORG_OS_PCI=$XORG_OS
> 	fi
>-	AC_SUBST([XORG_CORE_LIBS])
> 	AC_SUBST([XORG_LIBS])
> 	AC_SUBST([XORG_INCS])
> 	AC_SUBST([XORG_OS])
> 	AC_SUBST([XORG_OS_SUBDIR])
> 	AC_SUBST([XORG_OS_KBD])
>-	AC_SUBST([XORG_OS_PCI])
> 
> 	dnl only used in hw/xfree86/scanpci, TTBOMK
> 	AC_PATH_PROG(PERL, perl, no)
>@@ -998,6 +1081,11 @@
> 	AC_SUBST([XORG_CFLAGS])
> 	AC_SUBST([LD_EXPORT_SYMBOLS_FLAG])
> 
>+	dnl Module defines are used in the Xorg server and the drivers
>+	MODULE_DEFINES="$MODULE_DEFINES -DIN_MODULE -DXFree86Module"
>+	LOADER_DEFINES="$LOADER_DEFINES -DXFree86LOADER"
>+	SERVER_DEFINES="$SERVER_DEFINES -DXFree86Server"
>+
> 	dnl these only go in xorg-config.h
> 	XF86CONFIGFILE="xorg.conf"
> 	CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
>@@ -1005,7 +1093,6 @@
> 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
> 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
> 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
>-	AC_DEFINE(XFree86LOADER, 1, [Building XFree86 loader])
> 	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
> 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
> 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
>@@ -1033,7 +1120,12 @@
> 	AC_SUBST([logdir])
> fi
> AM_CONDITIONAL([XORG], [test "x$XORG" = xyes])
>+AM_CONDITIONAL([XORG_BUS_LINUXPCI], [test "x$xorg_bus_linuxpci" = xyes])
>+AM_CONDITIONAL([XORG_BUS_FREEBSDPCI], [test "x$xorg_bus_freebsdpci" = xyes])
>+AM_CONDITIONAL([XORG_BUS_NETBSDPCI], [test "x$xorg_bus_netbsdpci" = xyes])
> AM_CONDITIONAL([XORG_BUS_IX86PCI], [test "x$xorg_bus_ix86pci" = xyes])
>+AM_CONDITIONAL([XORG_BUS_PPCPCI], [test "x$xorg_bus_ppcpci" = xyes])
>+AM_CONDITIONAL([XORG_BUS_SPARCPCI], [test "x$xorg_bus_sparcpci" = xyes])
> AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
> AM_CONDITIONAL([XORG_LOADER_SPARC], [test "x$xorg_loader_sparcmuldiv" = xyes])
> AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes])
>@@ -1044,7 +1136,6 @@
> AM_CONDITIONAL(CFB, [test "x$XORG" = xyes])
> AM_CONDITIONAL(AFB, [test "x$XORG" = xyes])
> 
>-
> dnl Xprint DDX
> 
> AC_MSG_CHECKING([whether to build Xprint DDX])
>@@ -1052,9 +1143,9 @@
> 
> if test "x$XPRINT" = xyes; then
> 	PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau])
>-	XPRINT_EXTENSIONS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $LBX_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS"
>-	XPRINT_INCLUDES="$XEXT_INC $RENDER_INC $COMPOSITE_INC $RANDR_INC $XI_INC $FIXES_INC $DAMAGE_INC $XI_INC $GLX_INC $LBX_INC"
>-	XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $OS_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB $GLX_INC"
>+	XPRINT_EXTENSIONS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $LBX_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS"
>+	XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB $CWRAP_LIB $OS_LIB"
>+	AC_SUBST([XPRINT_CFLAGS])
> 	AC_SUBST([XPRINT_LIBS])
> 
> 	xpconfigdir=$libdir/X11/xserver
>@@ -1147,9 +1238,15 @@
>    XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
> fi
> 
>+# XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
>+# XKB_COMPILED_DIR (used in Makefiles) must not or install-sh gets confused
>+
>+XKBOUTPUT=`echo $XKBOUTPUT/ | sed 's|/*$|/|'`
>+XKB_COMPILED_DIR=`echo $XKBOUTPUT | sed 's|/*$||'`
>+
> AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir])
> 
>-AC_SUBST(XKM_OUTPUT_DIR)
>+AC_SUBST(XKB_COMPILED_DIR)
> 
> dnl and the rest of these are generic, so they're in config.h
> AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
>@@ -1175,7 +1272,9 @@
> AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
> 
> dnl xorgconfig CLI configuration utility
>-PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile])
>+PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
>+AC_SUBST(XORGCONFIG_DEP_CFLAGS)
>+AC_SUBST(XORGCONFIG_DEP_LIBS)
> 
> dnl xorgcfg GUI configuration utility
> AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], 
>@@ -1183,7 +1282,7 @@
> 	[XORGCFG=$enableval],[XORGCFG=yes])
> if test x$XORGCFG = xyes ; then
> 	PKG_CHECK_MODULES([XORGCFG_DEP], 
>-	    [xkbui xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm x11])
>+	    [xkbui xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm xext x11])
> 	AC_CHECK_LIB([curses],[waddstr],
> 	    [XORGCFG_DEP_LIBS="$XORGCFG_DEP_LIBS -lcurses"; CURSES=yes],
> 	    AC_CHECK_LIB([ncurses],[waddstr],
>@@ -1218,6 +1317,10 @@
> AM_CONDITIONAL(BSD_KBD_MODE, [test x$KBD_MODE_TYPE = xbsd])
> AM_CONDITIONAL(SUN_KBD_MODE, [test x$KBD_MODE_TYPE = xsun])
> 
>+AC_SUBST([MODULE_DEFINES])
>+AC_SUBST([LOADER_DEFINES])
>+AC_SUBST([SERVER_DEFINES])
>+
> CFLAGS="$XSERVER_CFLAGS $CFLAGS"
> AC_SUBST([CFLAGS])
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/damageext/Makefile.am xorg-server-0.99.4/damageext/Makefile.am
>--- xorg-server-0.99.3/damageext/Makefile.am	2005-07-02 11:59:25.000000000 -0700
>+++ xorg-server-0.99.4/damageext/Makefile.am	2005-12-01 22:02:39.000000000 -0800
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libdamageext.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> libdamageext_la_SOURCES = 	\
> 	damageext.c		\
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/dbe/Makefile.am xorg-server-0.99.4/dbe/Makefile.am
>--- xorg-server-0.99.3/dbe/Makefile.am	2005-07-27 10:50:13.000000000 -0700
>+++ xorg-server-0.99.4/dbe/Makefile.am	2005-12-01 22:02:39.000000000 -0800
>@@ -1,6 +1,8 @@
>-noinst_LTLIBRARIES = libdbe.la
>+noinst_LTLIBRARIES = libdbe.la libdbemodule.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
>+
>+INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
> 
> sdk_HEADERS = dbestruct.h
> 
>@@ -9,3 +11,10 @@
>         midbe.c \
>         midbe.h \
>         midbestr.h
>+
>+libdbemodule_la_CFLAGS = $(AM_CFLAGS) @MODULE_DEFINES@
>+libdbemodule_la_SOURCES = \
>+        dbe.c \
>+        midbe.c \
>+        midbe.h \
>+        midbestr.h
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/dix/Makefile.am xorg-server-0.99.4/dix/Makefile.am
>--- xorg-server-0.99.3/dix/Makefile.am	2005-11-03 09:08:06.000000000 -0800
>+++ xorg-server-0.99.4/dix/Makefile.am	2005-12-01 22:02:39.000000000 -0800
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libdix.la libxpstubs.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) \
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ \
> 	-DVENDOR_STRING=\""@VENDOR_STRING@"\" \
> 	-DVENDOR_RELEASE="@VENDOR_RELEASE@"
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/doc/Makefile.am xorg-server-0.99.4/doc/Makefile.am
>--- xorg-server-0.99.3/doc/Makefile.am	2005-11-03 08:57:01.000000000 -0800
>+++ xorg-server-0.99.4/doc/Makefile.am	2005-11-28 14:05:08.000000000 -0800
>@@ -1,4 +1,4 @@
>-appmandir =  $(mandir)/man$(APP_MAN_SUFFIX)
>+appmandir = $(APP_MAN_DIR)
> 
> # Xserver.man covers options generic to all X servers built in this tree
> appman_SOURCES = Xserver.man.pre
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/fb/fbmmx.c xorg-server-0.99.4/fb/fbmmx.c
>--- xorg-server-0.99.3/fb/fbmmx.c	2005-10-02 01:28:26.000000000 -0700
>+++ xorg-server-0.99.4/fb/fbmmx.c	2005-11-29 18:36:25.000000000 -0800
>@@ -2269,116 +2269,7 @@
> 		   width, height);
> }
> 
>-#if !defined(__amd64__) && !defined(__x86_64__)
> 
>-enum CPUFeatures {
>-    NoFeatures = 0,
>-    MMX = 0x1,
>-    MMX_Extensions = 0x2, 
>-    SSE = 0x6,
>-    SSE2 = 0x8,
>-    CMOV = 0x10
>-};
>-
>-static unsigned int detectCPUFeatures(void) {
>-    unsigned int result;
>-    char vendor[13];
>-    vendor[0] = 0;
>-    vendor[12] = 0;
>-    /* see p. 118 of amd64 instruction set manual Vol3 */
>-    /* We need to be careful about the handling of %ebx and
>-     * %esp here. We can't declare either one as clobbered
>-     * since they are special registers (%ebx is the "PIC
>-     * register" holding an offset to global data, %esp the
>-     * stack pointer), so we need to make sure they have their+      * original values when we access the output operands.
>-     */
>-    __asm__ ("pushf\n"
>-             "pop %%eax\n"
>-             "mov %%eax, %%ecx\n"
>-             "xor $0x00200000, %%eax\n"
>-             "push %%eax\n"
>-             "popf\n"
>-             "pushf\n"
>-             "pop %%eax\n"
>-             "mov $0x0, %%edx\n"
>-             "xor %%ecx, %%eax\n"
>-             "jz 1\n"
>-
>-             "mov $0x00000000, %%eax\n"
>-	     "push %%ebx\n"
>-             "cpuid\n"
>-             "mov %%ebx, %%eax\n"
>-	     "pop %%ebx\n"
>-	     "mov %%eax, %1\n"
>-             "mov %%edx, %2\n"
>-             "mov %%ecx, %3\n"
>-             "mov $0x00000001, %%eax\n"
>-	     "push %%ebx\n"
>-             "cpuid\n"
>-	     "pop %%ebx\n"
>-             "1:\n"
>-             "mov %%edx, %0\n"
>-             : "=r" (result), 
>-               "=m" (vendor[0]), 
>-               "=m" (vendor[4]), 
>-               "=m" (vendor[8])
>-             :
>-             : "%eax", "%ecx", "%edx"
>-        );
>-
>-    unsigned int features = 0;
>-    if (result) {
>-        /* result now contains the standard feature bits */
>-        if (result & (1 << 15))
>-            features |= CMOV;
>-        if (result & (1 << 23))
>-            features |= MMX;
>-        if (result & (1 << 25))
>-            features |= SSE;
>-        if (result & (1 << 26))
>-            features |= SSE2;
>-        if ((result & MMX) && !(result & SSE) && (strcmp(vendor, "AuthenticAMD") == 0)) {
>-            /* check for AMD MMX extensions */
>-
>-            unsigned int result;            
>-            __asm__("push %%ebx\n"
>-                    "mov $0x80000000, %%eax\n"
>-                    "cpuid\n"
>-                    "xor %%edx, %%edx\n"
>-                    "cmp $0x1, %%eax\n"
>-                    "jge 2\n"
>-                    "mov $0x80000001, %%eax\n"
>-                    "cpuid\n"
>-                    "2:\n"
>-                    "pop %%ebx\n"
>-                    "mov %%edx, %0\n"
>-                    : "=r" (result)
>-                    :
>-                    : "%eax", "%ecx", "%edx"
>-                );
>-            if (result & (1<<22))
>-                features |= MMX_Extensions;
>-        }
>-    }
>-    return features;
>-}
>-
>-Bool
>-fbHaveMMX (void)
>-{
>-    static Bool initialized = FALSE;
>-    static Bool mmx_present;
>-
>-    if (!initialized)
>-    {
>-        unsigned int features = detectCPUFeatures();
>-	mmx_present = (features & (MMX|MMX_Extensions)) == (MMX|MMX_Extensions);
>-        initialized = TRUE;
>-    }
>-    
>-    return mmx_present;
>-}
>-#endif /* __amd64__ */
> 
> 
> #endif /* RENDER */
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/fb/fbpict.c xorg-server-0.99.4/fb/fbpict.c
>--- xorg-server-0.99.3/fb/fbpict.c	2005-08-29 20:01:38.000000000 -0700
>+++ xorg-server-0.99.4/fb/fbpict.c	2005-11-29 18:36:25.000000000 -0800
>@@ -1336,3 +1336,121 @@
> 
>     return TRUE;
> }
>+
>+#ifdef USE_MMX
>+/* The CPU detection code needs to be in a file not compiled with
>+ * "-mmmx -msse", as gcc would generate CMOV instructions otherwise
>+ * that would lead to SIGILL instructions on old CPUs that don't have
>+ * it.
>+ */
>+#if !defined(__amd64__) && !defined(__x86_64__)
>+
>+enum CPUFeatures {
>+    NoFeatures = 0,
>+    MMX = 0x1,
>+    MMX_Extensions = 0x2, 
>+    SSE = 0x6,
>+    SSE2 = 0x8,
>+    CMOV = 0x10
>+};
>+
>+static unsigned int detectCPUFeatures(void) {
>+    unsigned int result;
>+    char vendor[13];
>+    vendor[0] = 0;
>+    vendor[12] = 0;
>+    /* see p. 118 of amd64 instruction set manual Vol3 */
>+    /* We need to be careful about the handling of %ebx and
>+     * %esp here. We can't declare either one as clobbered
>+     * since they are special registers (%ebx is the "PIC
>+     * register" holding an offset to global data, %esp the
>+     * stack pointer), so we need to make sure they have their+      * original values when we access the output operands.
>+     */
>+    __asm__ ("pushf\n"
>+             "pop %%eax\n"
>+             "mov %%eax, %%ecx\n"
>+             "xor $0x00200000, %%eax\n"
>+             "push %%eax\n"
>+             "popf\n"
>+             "pushf\n"
>+             "pop %%eax\n"
>+             "mov $0x0, %%edx\n"
>+             "xor %%ecx, %%eax\n"
>+             "jz 1\n"
>+
>+             "mov $0x00000000, %%eax\n"
>+	     "push %%ebx\n"
>+             "cpuid\n"
>+             "mov %%ebx, %%eax\n"
>+	     "pop %%ebx\n"
>+	     "mov %%eax, %1\n"
>+             "mov %%edx, %2\n"
>+             "mov %%ecx, %3\n"
>+             "mov $0x00000001, %%eax\n"
>+	     "push %%ebx\n"
>+             "cpuid\n"
>+	     "pop %%ebx\n"
>+             "1:\n"
>+             "mov %%edx, %0\n"
>+             : "=r" (result), 
>+               "=m" (vendor[0]), 
>+               "=m" (vendor[4]), 
>+               "=m" (vendor[8])
>+             :
>+             : "%eax", "%ecx", "%edx"
>+        );
>+
>+    unsigned int features = 0;
>+    if (result) {
>+        /* result now contains the standard feature bits */
>+        if (result & (1 << 15))
>+            features |= CMOV;
>+        if (result & (1 << 23))
>+            features |= MMX;
>+        if (result & (1 << 25))
>+            features |= SSE;
>+        if (result & (1 << 26))
>+            features |= SSE2;
>+        if ((result & MMX) && !(result & SSE) && (strcmp(vendor, "AuthenticAMD") == 0)) {
>+            /* check for AMD MMX extensions */
>+
>+            unsigned int result;            
>+            __asm__("push %%ebx\n"
>+                    "mov $0x80000000, %%eax\n"
>+                    "cpuid\n"
>+                    "xor %%edx, %%edx\n"
>+                    "cmp $0x1, %%eax\n"
>+                    "jge 2\n"
>+                    "mov $0x80000001, %%eax\n"
>+                    "cpuid\n"
>+                    "2:\n"
>+                    "pop %%ebx\n"
>+                    "mov %%edx, %0\n"
>+                    : "=r" (result)
>+                    :
>+                    : "%eax", "%ecx", "%edx"
>+                );
>+            if (result & (1<<22))
>+                features |= MMX_Extensions;
>+        }
>+    }
>+    return features;
>+}
>+
>+Bool
>+fbHaveMMX (void)
>+{
>+    static Bool initialized = FALSE;
>+    static Bool mmx_present;
>+
>+    if (!initialized)
>+    {
>+        unsigned int features = detectCPUFeatures();
>+	mmx_present = (features & (MMX|MMX_Extensions)) == (MMX|MMX_Extensions);
>+        initialized = TRUE;
>+    }
>+    
>+    return mmx_present;
>+}
>+#endif /* __amd64__ */
>+#endif
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/fb/Makefile.am xorg-server-0.99.4/fb/Makefile.am
>--- xorg-server-0.99.3/fb/Makefile.am	2005-10-05 14:38:40.000000000 -0700
>+++ xorg-server-0.99.4/fb/Makefile.am	2005-12-01 22:02:39.000000000 -0800
>@@ -1,6 +1,10 @@
> noinst_LTLIBRARIES = libfb.la libfbmmx.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+INCLUDES = \
>+	-I$(top_srcdir)/hw/xfree86/os-support \
>+	-I$(top_srcdir)/hw/xfree86/os-support/bus \
>+	-I$(top_srcdir)/hw/xfree86/common
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/GL/glx/glcontextmodes.c xorg-server-0.99.4/GL/glx/glcontextmodes.c
>--- xorg-server-0.99.3/GL/glx/glcontextmodes.c	2005-07-03 05:17:04.000000000 -0700
>+++ xorg-server-0.99.4/GL/glx/glcontextmodes.c	2005-08-08 10:22:44.000000000 -0700
>@@ -31,15 +31,11 @@
>  * \author Ian Romanick <idr@us.ibm.com>
>  */
> 
>-#ifdef HAVE_DIX_CONFIG_H
>-#include <dix-config.h>
>-#endif
>-
>-#ifdef DRI_NEW_INTERFACE_ONLY
>+#if defined(IN_MINI_GLX)
> # include <stdlib.h>
> # include <string.h>
> # include <GL/gl.h>
>-# include "dri_interface.h"
>+# include "GL/internal/dri_interface.h"
> # include "imports.h"
> # define __glXMemset  memset
> #else
>@@ -59,11 +55,11 @@
> #  define _mesa_malloc(b) Xmalloc(b)
> #  define _mesa_free(m) Xfree(m)
> # endif /* XFree86Server */
>-#endif  /* DRI_NEW_INTERFACE_ONLY */
>+#endif /* !defined(IN_MINI_GLX) */
> 
> #include "glcontextmodes.h"
> 
>-#ifndef DRI_NEW_INTERFACE_ONLY
>+#if !defined(IN_MINI_GLX)
> #define NUM_VISUAL_TYPES   6
> 
> /**
>@@ -324,7 +320,7 @@
> 	return GLX_BAD_ATTRIBUTE;
>     }
> }
>-#endif /* DRI_NEW_INTERFACE_ONLY */
>+#endif /* !defined(IN_MINI_GLX) */
> 
> 
> /**
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/GL/glx/glcontextmodes.h xorg-server-0.99.4/GL/glx/glcontextmodes.h
>--- xorg-server-0.99.3/GL/glx/glcontextmodes.h	2005-07-03 05:17:04.000000000 -0700
>+++ xorg-server-0.99.4/GL/glx/glcontextmodes.h	2005-08-08 10:22:44.000000000 -0700
>@@ -27,23 +27,19 @@
>  * \author Ian Romanick <idr@us.ibm.com>
>  */
> 
>-#ifdef HAVE_DIX_CONFIG_H
>-#include <dix-config.h>
>-#endif
>-
> #ifndef GLCONTEXTMODES_H
> #define GLCONTEXTMODES_H
> 
> #include "GL/internal/glcore.h"
> 
>-#ifndef DRI_NEW_INTERFACE_ONLY
>+#if !defined(IN_MINI_GLX)
> extern GLint _gl_convert_from_x_visual_type( int visualType );
> extern GLint _gl_convert_to_x_visual_type( int visualType );
> extern void _gl_copy_visual_to_context_mode( __GLcontextModes * mode,
>     const __GLXvisualConfig * config );
> extern int _gl_get_context_mode_data( const __GLcontextModes *mode,
>     int attribute, int *value_return );
>-#endif /* DRI_NEW_INTERFACE_ONLY */
>+#endif /* !defined(IN_MINI_GLX) */
> 
> extern __GLcontextModes * _gl_context_modes_create( unsigned count,
>     size_t minimum_size );
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/GL/glx/Makefile.am xorg-server-0.99.4/GL/glx/Makefile.am
>--- xorg-server-0.99.3/GL/glx/Makefile.am	2005-08-01 20:36:09.000000000 -0700
>+++ xorg-server-0.99.4/GL/glx/Makefile.am	2005-12-01 22:02:36.000000000 -0800
>@@ -1,11 +1,18 @@
> noinst_LTLIBRARIES = libglx.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) -I@MESA_SOURCE@/include
>+AM_CFLAGS = \
>+	@DIX_CFLAGS@ \
>+	@GL_CFLAGS@ \
>+	@XLIB_CFLAGS@ \
>+	-I@MESA_SOURCE@/include \
>+	@SERVER_DEFINES@ \
>+	@MODULE_DEFINES@ \
>+	@LOADER_DEFINES@
> 
> # none yet
> #sdk_HEADERS =
> 
>-INCLUDES = -I$(top_srcdir)/GL/include
>+INCLUDES = -I$(top_srcdir)/GL/include -I$(top_srcdir)/hw/xfree86/os-support
> 
> nodist_libglx_la_SOURCES = indirect_size.c indirect_size.h
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/GL/mesa/array_cache/Makefile.am xorg-server-0.99.4/GL/mesa/array_cache/Makefile.am
>--- xorg-server-0.99.3/GL/mesa/array_cache/Makefile.am	2005-08-20 11:11:16.000000000 -0700
>+++ xorg-server-0.99.4/GL/mesa/array_cache/Makefile.am	2005-12-01 22:02:36.000000000 -0800
>@@ -1,5 +1,7 @@
> noinst_LTLIBRARIES = libac.la
> 
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>            -I../array_cache \
>@@ -10,6 +12,7 @@
>            -I../swrast \
>            -I../swrast_setup \
>            -I../tnl \
>-           -I..
>+           -I.. \
>+           -I$(top_srcdir)/hw/xfree86/os-support
> 
> nodist_libac_la_SOURCES = ac_context.c ac_import.c
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/GL/mesa/glapi/Makefile.am xorg-server-0.99.4/GL/mesa/glapi/Makefile.am
>--- xorg-server-0.99.3/GL/mesa/glapi/Makefile.am	2005-08-20 11:11:16.000000000 -0700
>+++ xorg-server-0.99.4/GL/mesa/glapi/Makefile.am	2005-12-01 22:02:36.000000000 -0800
>@@ -1,5 +1,7 @@
> noinst_LTLIBRARIES = libglapi.la
> 
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>            -I../array_cache \
>@@ -10,6 +12,7 @@
>            -I../swrast \
>            -I../swrast_setup \
>            -I../tnl \
>-           -I..
>+           -I.. \
>+           -I$(top_srcdir)/hw/xfree86/os-support
> 
> nodist_libglapi_la_SOURCES = glapi.c glthread.c
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/GL/mesa/main/Makefile.am xorg-server-0.99.4/GL/mesa/main/Makefile.am
>--- xorg-server-0.99.3/GL/mesa/main/Makefile.am	2005-08-20 11:11:16.000000000 -0700
>+++ xorg-server-0.99.4/GL/mesa/main/Makefile.am	2005-12-01 22:02:36.000000000 -0800
>@@ -1,5 +1,7 @@
> noinst_LTLIBRARIES = libmain.la
> 
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>            -I../array_cache \
>@@ -10,7 +12,8 @@
>            -I../swrast \
>            -I../swrast_setup \
>            -I../tnl \
>-           -I..
>+           -I.. \
>+           -I$(top_srcdir)/hw/xfree86/os-support
> 
> if NEED_VSNPRINTF
> VSNPRINTF_SOURCES = vsnprintf.c
>@@ -37,6 +40,7 @@
>                     enable.c \
>                     enums.c \
>                     eval.c \
>+                    execmem.c \
>                     extensions.c \
>                     fbobject.c \
>                     feedback.c \
>@@ -52,6 +56,7 @@
>                     light.c \
>                     lines.c \
>                     matrix.c \
>+                    mm.c \
>                     occlude.c \
>                     pixel.c \
>                     points.c \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/GL/mesa/math/Makefile.am xorg-server-0.99.4/GL/mesa/math/Makefile.am
>--- xorg-server-0.99.3/GL/mesa/math/Makefile.am	2005-08-20 11:11:16.000000000 -0700
>+++ xorg-server-0.99.4/GL/mesa/math/Makefile.am	2005-12-01 22:02:37.000000000 -0800
>@@ -1,5 +1,7 @@
> noinst_LTLIBRARIES = libmath.la
> 
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>            -I../array_cache \
>@@ -10,7 +12,8 @@
>            -I../swrast \
>            -I../swrast_setup \
>            -I../tnl \
>-           -I..
>+           -I.. \
>+           -I$(top_srcdir)/hw/xfree86/os-support
> 
> nodist_libmath_la_SOURCES = m_debug_clip.c \
>                        m_debug_norm.c \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/GL/mesa/shader/grammar/Makefile.am xorg-server-0.99.4/GL/mesa/shader/grammar/Makefile.am
>--- xorg-server-0.99.3/GL/mesa/shader/grammar/Makefile.am	2005-08-20 11:11:16.000000000 -0700
>+++ xorg-server-0.99.4/GL/mesa/shader/grammar/Makefile.am	2005-12-01 22:02:37.000000000 -0800
>@@ -1,5 +1,7 @@
> noinst_LTLIBRARIES = libgrammar.la
> 
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../../X \
>            -I../../array_cache \
>@@ -10,6 +12,7 @@
>            -I../../swrast \
>            -I../../swrast_setup \
>            -I../../tnl \
>-           -I../..
>+           -I../.. \
>+           -I$(top_srcdir)/hw/xfree86/os-support
> 
> nodist_libgrammar_la_SOURCES = grammar_mesa.c
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/GL/mesa/shader/Makefile.am xorg-server-0.99.4/GL/mesa/shader/Makefile.am
>--- xorg-server-0.99.3/GL/mesa/shader/Makefile.am	2005-08-20 11:11:16.000000000 -0700
>+++ xorg-server-0.99.4/GL/mesa/shader/Makefile.am	2005-12-01 22:02:37.000000000 -0800
>@@ -2,6 +2,8 @@
> 
> noinst_LTLIBRARIES = libshader.la
> 
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>            -I../array_cache \
>@@ -14,7 +16,8 @@
>            -I../swrast \
>            -I../swrast_setup \
>            -I../tnl \
>-           -I..
>+           -I.. \
>+           -I$(top_srcdir)/hw/xfree86/os-support
> 
> nodist_libshader_la_SOURCES = arbfragparse.c \
>                       arbprogparse.c \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/GL/mesa/shader/slang/Makefile.am xorg-server-0.99.4/GL/mesa/shader/slang/Makefile.am
>--- xorg-server-0.99.3/GL/mesa/shader/slang/Makefile.am	2005-08-20 11:11:17.000000000 -0700
>+++ xorg-server-0.99.4/GL/mesa/shader/slang/Makefile.am	2005-12-01 22:02:37.000000000 -0800
>@@ -1,5 +1,7 @@
> noinst_LTLIBRARIES = libslang.la
> 
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../grammar \
>            -I../../X \
>@@ -11,7 +13,8 @@
>            -I../../swrast \
>            -I../../swrast_setup \
>            -I../../tnl \
>-           -I../..
>+           -I../.. \
>+           -I$(top_srcdir)/hw/xfree86/os-support
> 
> nodist_libslang_la_SOURCES = slang_assemble_assignment.c \
> 		      slang_assemble.c \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/GL/mesa/swrast/Makefile.am xorg-server-0.99.4/GL/mesa/swrast/Makefile.am
>--- xorg-server-0.99.3/GL/mesa/swrast/Makefile.am	2005-08-20 11:11:17.000000000 -0700
>+++ xorg-server-0.99.4/GL/mesa/swrast/Makefile.am	2005-12-01 22:02:37.000000000 -0800
>@@ -1,5 +1,7 @@
> noinst_LTLIBRARIES = libswrast.la
> 
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>            -I../array_cache \
>@@ -10,7 +12,8 @@
>            -I../swrast \
>            -I../swrast_setup \
>            -I../tnl \
>-           -I..
>+           -I.. \
>+           -I$(top_srcdir)/hw/xfree86/os-support
> 
> nodist_libswrast_la_SOURCES = s_aaline.c \
>                       s_aatriangle.c \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/GL/mesa/swrast_setup/Makefile.am xorg-server-0.99.4/GL/mesa/swrast_setup/Makefile.am
>--- xorg-server-0.99.3/GL/mesa/swrast_setup/Makefile.am	2005-08-20 11:11:17.000000000 -0700
>+++ xorg-server-0.99.4/GL/mesa/swrast_setup/Makefile.am	2005-12-01 22:02:37.000000000 -0800
>@@ -1,5 +1,7 @@
> noinst_LTLIBRARIES = libss.la
> 
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>            -I../array_cache \
>@@ -10,6 +12,7 @@
>            -I../swrast \
>            -I../swrast_setup \
>            -I../tnl \
>-           -I..
>+           -I.. \
>+           -I$(top_srcdir)/hw/xfree86/os-support
> 
> nodist_libss_la_SOURCES = ss_context.c ss_triangle.c
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/GL/mesa/tnl/Makefile.am xorg-server-0.99.4/GL/mesa/tnl/Makefile.am
>--- xorg-server-0.99.3/GL/mesa/tnl/Makefile.am	2005-08-20 11:11:17.000000000 -0700
>+++ xorg-server-0.99.4/GL/mesa/tnl/Makefile.am	2005-12-01 22:02:38.000000000 -0800
>@@ -1,5 +1,7 @@
> noinst_LTLIBRARIES = libtnl.la
> 
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>            -I../array_cache \
>@@ -10,7 +12,8 @@
>            -I../swrast \
>            -I../swrast_setup \
>            -I../tnl \
>-           -I..
>+           -I.. \
>+           -I$(top_srcdir)/hw/xfree86/os-support
> 
> nodist_libtnl_la_SOURCES = t_array_api.c \
>                       t_array_import.c \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/GL/mesa/X/Makefile.am xorg-server-0.99.4/GL/mesa/X/Makefile.am
>--- xorg-server-0.99.3/GL/mesa/X/Makefile.am	2005-09-03 00:08:58.000000000 -0700
>+++ xorg-server-0.99.4/GL/mesa/X/Makefile.am	2005-12-01 22:02:36.000000000 -0800
>@@ -11,11 +11,12 @@
>            -I../swrast_setup \
>            -I../tnl \
>            -I.. \
>+           -I../../glx \
>            -I$(top_srcdir)/GL/glx \
>-           -I$(top_srcdir)/GL/include
>+           -I$(top_srcdir)/GL/include \
>+           -I$(top_srcdir)/hw/xfree86/os-support
> 
>-# terribly gross hack.  i need a shower now.
>-AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server -include dix-config.h
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> libX_la_SOURCES = xf86glx.c \
>                   xf86glx_util.c \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/GL/symlink-mesa.sh xorg-server-0.99.4/GL/symlink-mesa.sh
>--- xorg-server-0.99.3/GL/symlink-mesa.sh	2005-08-01 11:41:54.000000000 -0700
>+++ xorg-server-0.99.4/GL/symlink-mesa.sh	2005-11-29 08:39:24.000000000 -0800
>@@ -122,6 +122,7 @@
>     action enums.h
>     action eval.c
>     action eval.h
>+    action execmem.c
>     action extensions.c
>     action extensions.h
>     action fbobject.c
>@@ -153,6 +154,8 @@
>     action macros.h
>     action matrix.c
>     action matrix.h
>+    action mm.c
>+    action mm.h
>     action mtypes.h
>     action occlude.c
>     action occlude.h
>@@ -520,6 +523,11 @@
> 
>     action indirect_size.c
>     action indirect_size.h
>+
>+    src_dir src/mesa/drivers/dri/common
>+
>+    action glcontextmodes.c
>+    action glcontextmodes.h
> }
> 
> #########
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/dmx/config/Makefile.am xorg-server-0.99.4/hw/dmx/config/Makefile.am
>--- xorg-server-0.99.3/hw/dmx/config/Makefile.am	2005-11-01 07:01:50.000000000 -0800
>+++ xorg-server-0.99.4/hw/dmx/config/Makefile.am	2005-12-01 22:02:40.000000000 -0800
>@@ -22,6 +22,7 @@
> 
> AM_YFLAGS = -d
> AM_CFLAGS = \
>+	@SERVER_DEFINES@ \
> 	-I$(top_srcdir)/hw/dmx \
> 	-DHAVE_DMX_CONFIG_H \
> 	-DDMX_LOG_STANDALONE \
>@@ -47,9 +48,26 @@
> dmxtodmx_SOURCES = dmxtodmx.c
> dmxtodmx_LDADD = -L. -ldmxconfig
> 
>-dist_man1_MANS = xdmxconfig.man vdltodmx.man dmxtodmx.man
>+appmandir = $(APP_MAN_DIR)
>+
>+appman_SOURCES = xdmxconfig.man vdltodmx.man dmxtodmx.man
>+appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
>+
>+CLEANFILES = $(appman_DATA)
>+
>+SUFFIXES = .$(APP_MAN_SUFFIX) .man
>+
>+# Strings to replace in man pages
>+XORGRELSTRING = @PACKAGE_STRING@
>+  XORGMANNAME = X Version 11
>+
>+MAN_SUBSTS = -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' 
>+
>+.man.$(APP_MAN_SUFFIX):
>+	sed $(MAN_SUBSTS) < $< > $@
> 
> EXTRA_DIST = \
>+	$(appman_SOURCES) \
> 	test-a.in test-a.out \
> 	test-b.in test-b.out \
> 	test-c.in test-c.out \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/dmx/glxProxy/Makefile.am xorg-server-0.99.4/hw/dmx/glxProxy/Makefile.am
>--- xorg-server-0.99.3/hw/dmx/glxProxy/Makefile.am	2005-08-20 11:11:17.000000000 -0700
>+++ xorg-server-0.99.4/hw/dmx/glxProxy/Makefile.am	2005-12-01 22:02:40.000000000 -0800
>@@ -31,10 +31,13 @@
>                         renderpixswap.c \
>                         unpack.h
> 
>-AM_CFLAGS = -I$(top_srcdir)/hw/dmx \
>+AM_CFLAGS = @SERVER_DEFINES@ \
>+            @MODULE_DEFINES@ \
>+            -I$(top_srcdir)/hw/dmx \
>             -I$(top_srcdir)/include \
>             -I$(top_srcdir)/GL/include \
>             -I$(top_builddir)/GL/include \
> 	    -I@MESA_SOURCE@/include \
>             -DHAVE_DMX_CONFIG_H \
>-            @DMXMODULES_CFLAGS@
>+            @DMXMODULES_CFLAGS@ \
>+            -I$(top_srcdir)/hw/xfree86/os-support
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/dmx/input/Makefile.am xorg-server-0.99.4/hw/dmx/input/Makefile.am
>--- xorg-server-0.99.3/hw/dmx/input/Makefile.am	2005-10-05 19:35:22.000000000 -0700
>+++ xorg-server-0.99.4/hw/dmx/input/Makefile.am	2005-12-01 22:02:40.000000000 -0800
>@@ -55,7 +55,8 @@
>                         $(DMXSRCS) \
>                         $(LIBSRCS)
> 
>-AM_CFLAGS = -I$(top_srcdir)/hw/dmx \
>+AM_CFLAGS = @SERVER_DEFINES@ \
>+            -I$(top_srcdir)/hw/dmx \
>             -I$(top_srcdir)/hw/xfree86/common \
>             -DHAVE_DMX_CONFIG_H \
>             @DMXMODULES_CFLAGS@
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/dmx/Makefile.am xorg-server-0.99.4/hw/dmx/Makefile.am
>--- xorg-server-0.99.3/hw/dmx/Makefile.am	2005-10-05 19:35:22.000000000 -0700
>+++ xorg-server-0.99.4/hw/dmx/Makefile.am	2005-12-01 22:02:40.000000000 -0800
>@@ -79,9 +79,30 @@
>              config/libdmxconfig.a \
>              @DMXMODULES_LIBS@
> 
>-Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H \
>-              -DXFree86Server \
>+Xdmx_CFLAGS = @SERVER_DEFINES@ \
>+              -DHAVE_DMX_CONFIG_H \
>               $(GLX_INCS) \
>               @DMXMODULES_CFLAGS@
> 
>-dist_man_MANS = Xdmx.1
>+# Man page
>+appmandir = $(APP_MAN_DIR)
>+
>+appman_SOURCES = Xdmx.man
>+appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
>+
>+CLEANFILES = $(appman_DATA)
>+
>+# Strings to replace in man pages
>+XORGRELSTRING = @PACKAGE_STRING@
>+  XORGMANNAME = X Version 11
>+
>+MAN_SUBSTS = \
>+	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
>+	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g'
>+
>+SUFFIXES = .$(APP_MAN_SUFFIX) .man
>+
>+.man.$(APP_MAN_SUFFIX):
>+	sed $(MAN_SUBSTS) < $< > $@
>+
>+EXTRA_DIST = $(appman_SOURCES)
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/dmx/Xdmx.1 xorg-server-0.99.4/hw/dmx/Xdmx.1
>--- xorg-server-0.99.3/hw/dmx/Xdmx.1	2004-06-30 13:06:53.000000000 -0700
>+++ xorg-server-0.99.4/hw/dmx/Xdmx.1	1969-12-31 16:00:00.000000000 -0800
>@@ -1,741 +0,0 @@
>-.\" $XFree86$
>-.\"
>-.\" Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
>-.\" All Rights Reserved.
>-.\"
>-.\" Permission is hereby granted, free of charge, to any person obtaining
>-.\" a copy of this software and associated documentation files (the
>-.\" "Software"), to deal in the Software without restriction, including
>-.\" without limitation on the rights to use, copy, modify, merge,
>-.\" publish, distribute, sublicense, and/or sell copies of the Software,
>-.\" and to permit persons to whom the Software is furnished to do so,
>-.\" subject to the following conditions:
>-.\"
>-.\" he above copyright notice and this permission notice (including the
>-.\" next paragraph) shall be included in all copies or substantial
>-.\" portions of the Software.
>-.\"
>-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>-.\" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
>-.\" NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
>-.\" BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
>-.\" ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
>-.\" CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
>-.\" SOFTWARE.
>-.TH Xdmx 1 __vendorversion__
>-.SH NAME
>-Xdmx - Distributed Multi-head X server
>-.SH SYNOPSIS
>-.B Xdmx
>-[:display] [option ...]
>-.SH DESCRIPTION
>-.I Xdmx
>-is a proxy X server that uses one or more other X servers as its display
>-devices.  It provides multi-head X functionality for displays that might
>-be located on different machines.
>-.I Xdmx
>-functions as a front-end X server that acts as a proxy to a set of
>-back-end X servers.  All of the visible rendering is passed to the
>-back-end X servers.  Clients connect to the
>-.I Xdmx
>-front-end, and everything appears as it would in a regular multi-head
>-configuration.  If Xinerama is enabled (e.g., with
>-.B +xinerama
>-on the command line), the clients see a single large screen.
>-.PP
>-.I Xdmx
>-communicates to the back-end X servers using the standard X11 protocol,
>-and standard and/or commonly available X server extensions.
>-.SH OPTIONS
>-In addition to the normal X server options described in the
>-.I Xserver(1)
>-manual page,
>-.I Xdmx
>-accepts the following command line switches:
>-.TP 8
>-.BI "\-display " display-name
>-This specifies the name(s) of the back-end X server display(s) to connect
>-to.  This option may be specified multiple times to connect to more than
>-one back-end display.  The first is used as screen 0, the second as screen 1,
>-etc.  If this option is omitted, the
>-.B $DISPLAY
>-environment variable is used as the single back-end X server display.
>-.sp
>-.TP 8
>-.BI "\-xinput " input-source
>-This specifies the source to use for XInput extension devices.  The
>-choices are the same as for
>-.BR "\-input " ,
>-described below, except that core devices on backend servers cannot be
>-treated as XInput extension devices.  (Although extension devices on
>-backend and console servers are supported as extension devices under
>-.IR Xdmx ).
>-.sp
>-.TP 8
>-.BI "\-input " input-source
>-This specifies the source to use for the core input devices.  The choices are:
>-.RS
>-.TP 4
>-.B dummy
>-A set of dummy core input drivers are used.  These never generate any
>-input events.
>-.sp
>-.TP 4
>-.B local
>-The raw keyboard and pointer from the local computer are used.  A
>-comma-separated list of driver names can be appended.  For example, to
>-select the example Linux keyboard and PS/2 mouse driver use:
>-.BR "-input local,kbd,ps2" .
>-The following drivers have been implemented for Linux: kbd, ms (a
>-two-button Microsoft mouse driver), ps2 (a PS/2 mouse driver), usb-mou
>-(a USB mouse driver), usb-kbd (a USB keyboard driver), and usb-oth (a
>-USB non-keyboard, non-mouse driver).  Additional drivers may be
>-implemented in the future.  Appropriate defaults will be used if no
>-comma-separated list is provided.
>-.sp
>-.TP 4
>-.I display-name
>-If the display-name is a back-end server, then core input events are
>-taken from the server specified.  Otherwise, a console window will be
>-opened on the specified display.
>-.sp
>-If the
>-.I display-name
>-is followed by ",xi" then XInput extension devices on the display will
>-be used as
>-.I Xdmx
>-XInput extension devices.  If the
>-.I display-name
>-is followed by ",noxi" then XInput extension devices on the display will
>-.B not
>-be used as
>-.I Xdmx
>-XInput extension devices.  Currently, the default is ",xi".
>-.sp
>-If the
>-.I display-name
>-is followed by ",console" and the
>-.I display-name
>-refers to a display that is used as a backend display, then a console
>-window will be opened on that display
>-.B and
>-that display will be treated as a backend display.  Otherwise (or if
>-",noconsole" is used), the display will be treated purely as a backend
>-or a console display, as described above.
>-.sp
>-If the
>-.I display-name
>-is followed by ",windows", then outlines of the windows on the backend
>-will be displayed inside the console window.  Otherwise (or if
>-",nowindows" is used), the console window will not display the outlines
>-of backend windows.  (This option only applies to console input.)
>-.sp
>-If the
>-.I display-name
>-is followed by ",xkb", then the next 1 to 3 comma-separated parameters
>-will specify the keycodes, symbols, and geometry of the keyboard for
>-this input device.  For example, ",xkb,xfree86,pc104" will specify that
>-the "xfree86" keycodes and the "pc104" symbols should be used to
>-initialize the keyboard.  For an SGI keyboard, ",xkb,sgi/indy(pc102)"
>-might be useful.  A list of keycodes, symbols, and geometries can be
>-found in
>-.IR /usr/X11R6/lib/X11/xkb .
>-If this option is not specified, the input device will be queried,
>-perhaps using the XKEYBOARD extension.
>-.RE
>-.sp
>-.RS
>-If this option isn't specified, the default input source is the first
>-back-end server (the one used for screen 0).  The console window shows
>-the layout of the back-end display(s) and pointer movements and key
>-presses within the console window will be used as core input devices.
>-.sp
>-Several special function keys are active, depending on the input
>-source:
>-.sp
>-.RS
>-.B Ctrl-Alt-q
>-will terminate the
>-.I Xdmx
>-server in all modes.
>-.sp
>-.B Ctrl-Alt-g
>-will toggle a
>-server grab in console mode (a special cursor, currently a spider, is
>-used to indicate an active server grab).
>-.sp
>-.B Ctrl-Alt-f
>-will toggle fine-grain motion in console mode (a special cursor,
>-currently a cross hair, is used to indicate this mode).  If this mode is
>-combined with a server grab, then the cursor will have 4 lines instead
>-of only 2.
>-.sp
>-.BR Ctrl-Alt-F1 " through " Ctrl-Alt-F12
>-will switch to another VC in local (raw) mode.
>-.RE
>-.RE
>-.sp
>-.TP 8
>-.BI "-shadowfb"
>-This option turns on (legacy) support for the shadow frame buffer.
>-.sp
>-.TP 8
>-.BI "-noshadowfb"
>-This option turns off (legacy) support for the shadow frame buffer.
>-Note that this option has been deprecated and will be removed in the
>-next release.
>-.sp
>-.TP 8
>-.BI "-nomulticursor"
>-This option turns off support for displaying multiple cursors on
>-overlapped back-end displays.  This option is available for testing and
>-benchmarking purposes.
>-.sp
>-.TP 8
>-.BI "-fontpath"
>-This option sets the
>-.I Xdmx
>-server's default font path.  This option can be specified multiple times
>-to accommodate multiple font paths.  See the
>-.B "FONT PATHS"
>-section below for very important information regarding setting the
>-default font path.
>-.sp
>-.TP 8
>-.BI "-configfile " filename
>-Specify the configuration file that should be read.  Note that if the
>-.B \-display
>-command-line option is used, then the configuration file will be
>-ignored.
>-.sp
>-.TP 8
>-.BI "-config " name
>-Specify a configuration to use.  The
>-.I name
>-will be the name following the
>-.B virtual
>-keyword in the configuration file.
>-.sp
>-.TP 8
>-.BI "-stat " "interval screens"
>-This option enables the display of performance statistics.  The interval
>-is in seconds.  The screens is a count of the number of back-end screens
>-for which data is printed each interval.  Specifying 0 for screens will
>-display data for all screens.
>-.sp
>-For each screen, the following information is printed: the screen
>-number, an absolute count of the number of XSync() calls made
>-(SyncCount), the rate of these calls during the previous interval
>-(Sync/s), the average round-trip time (in microseconds) of the last 10
>-XSync() calls (avSync), the maximum round-trip time (in microseconds) of
>-the last 10 XSync calls (mxSync), the average number of XSync() requests
>-that were pending but not yet processed for each of the last 10
>-processed XSync() calls, the maximum number of XSync() requests that
>-were pending but not yet processed for each of the last 10 processed
>-XSync() calls, and a histogram showing the distribution of the times of
>-all of the XSync() calls that were made during the previous interval.
>-.sp
>-(The length of the moving average and the number and value of histogram
>-bins are configurable at compile time in the
>-.B dmxstat.h
>-header file.)
>-.sp
>-.TP 8
>-.BI "-syncbatch " interval
>-This option sets the
>-.I interval
>-in milliseconds for XSync() batching.  An
>-.I interval
>-less than or equal to 0 will disable XSync() batching.  The default
>-.I interval
>-is 100 ms.
>-.sp
>-.TP 8
>-.BI "-nooffscreenopt"
>-This option disables the offscreen optimization.  Since the lazy window
>-creation optimization requires the offscreen optimization to be enabled,
>-this option will also disable the lazy window creation optimization.
>-.sp
>-.TP 8
>-.BI "-nowindowopt"
>-This option disables the lazy window creation optimization.
>-.sp
>-.TP 8
>-.BI "-nosubdivprims"
>-This option disables the primitive subdivision optimization.
>-.sp
>-.TP 8
>-.BI "-noxkb"
>-Disable use of the XKB extension for communication with the back end
>-displays.  (Combine with
>-.B "-kb"
>-to disable all use of XKB.)
>-.sp
>-.TP 8
>-.BI "-depth " int
>-This option sets the root window's default depth.  When choosing a
>-default visual from those available on the back-end X server, the first
>-visual with that matches the depth specified is used.
>-.sp
>-This option can be combined with the
>-.BI "-cc"
>-option, which specifies the default color visual class, to force the use
>-of a specific depth and color class for the root window.
>-.sp
>-.TP 8
>-.BI "-norender"
>-This option disables the RENDER extension.
>-.sp
>-.TP 8
>-.BI "-noglxproxy"
>-This option disables GLX proxy -- the build-in GLX extension
>-implementation that is DMX aware.
>-.sp
>-.TP 8
>-.BI "-noglxswapgroup"
>-This option disables the swap group and swap barrier extensions in GLX
>-proxy.
>-.sp
>-.TP 8
>-.BI "-glxsyncswap"
>-This option enables synchronization after a swap buffers call by waiting
>-until all X protocol has been processed.  When a client issues a
>-glXSwapBuffers request, Xdmx relays that request to each back-end X
>-server, and those requests are buffered along with all other protocol
>-requests.  However, in systems that have large network buffers, this
>-buffering can lead to the set of back-end X servers handling the swap
>-buffers request asynchronously.  With this option, an XSync() request is
>-issued to each back-end X server after sending the swap buffers request.
>-The XSync() requests will flush all buffered protocol (including the
>-swap buffers requests) and wait until the back-end X servers have
>-processed those requests before continuing.  This option does not wait
>-until all GL commands have been processed so there might be previously
>-issued commands that are still being processed in the GL pipe when the
>-XSync() request returns.  See the
>-.BI "-glxfinishswap"
>-option below if Xdmx should wait until the GL commands have been
>-processed.
>-.sp
>-.TP 8
>-.BI "-glxfinishswap"
>-This option enables synchronization after a swap buffers call by waiting
>-until all GL commands have been completed.  It is similar to the
>-.BI "-glxsyncswap"
>-option above; however, instead of issuing an XSync(), it issues a
>-glFinish() request to each back-end X server after sending the swap
>-buffers requests.  The glFinish() request will flush all buffered
>-protocol requests, process both X and GL requests, and wait until all
>-previously called GL commands are complete before returning.
>-.sp
>-.TP 8
>-.BI "-ignorebadfontpaths"
>-This option ignores font paths that are not available on all back-end
>-servers by removing the bad font path(s) from the default font path
>-list.  If no valid font paths are left after removing the bad paths, an
>-error to that effect is printed in the log.
>-.sp
>-.TP 8
>-.BI "-addremovescreens"
>-This option enables the dynamic addition and removal of screens, which
>-is disabled by default.  Note that GLXProxy and Render do not yet
>-support dynamic addition and removal of screens, and must be disabled
>-via the
>-.BI "-noglxproxy"
>-and
>-.BI "-norender"
>-command line options described above.
>-.sp
>-.TP 8
>-.BI "-param"
>-This option specifies parameters on the command line.  Currently, only
>-parameters dealing with XKEYBOARD configuration are supported.  These
>-parameters apply only to the core keyboard.  Parameter values are
>-installation-dependent.  Please see
>-.I /usr/X11R6/lib/X11/xkb
>-or a similar directory for complete information.
>-.RS
>-.TP 8
>-.B XkbRules
>-Defaults to "xfree86".  Other values may include "sgi" and "sun".
>-.sp
>-.TP 8
>-.B XkbModel
>-Defaults to "pc101".  When used with "xfree86" rules, other values may
>-include "pc102", "pc104", "pc105", "microsoft", and many others.  When
>-used with "sun" rules, other values may include "type4" and "type5".
>-.sp
>-.TP 8
>-.B XkbLayout
>-Defaults to "us".  Other country codes and "dvorak" are usually
>-available.
>-.sp
>-.TP 8
>-.B XkbVariant
>-Defaults to "".
>-.sp
>-.TP 8
>-.B XkbOptions
>-Defaults to "".
>-.RE
>-.SH "CONFIGURATION FILE GRAMMAR"
>-The following words and tokens are reserved:
>-.RS
>-.B virtual
>-.B display
>-.B wall
>-.B option
>-.B param
>-.B {
>-.B }
>-.B ;
>-.B #
>-.RE
>-.PP
>-Comments start with a
>-.B #
>-mark and extend to the end of the line.  They may appear anywhere.  If a
>-configuration file is read into
>-.BR xdmxconfig ,
>-the comments in that file will be preserved, but will not be editable.
>-.PP
>-The grammar is as follows:
>-.RS
>-virtual-list ::= [ virtual-list ] | virtual
>-
>-virtual ::=
>-.B virtual
>-[ name ] [ dim ]
>-.B {
>-dw-list
>-.B }
>-
>-dw-list ::= [ dw-list ] | dw
>-
>-dw ::= display | wall | option
>-
>-display ::=
>-.B display
>-name [ geometry ] [ / geometry ] [ origin ]
>-.B ;
>-
>-wall ::=
>-.B wall
>-[ dim ] [ dim ] name-list
>-.B ;
>-
>-option ::=
>-.B option
>-name-list
>-.B ;
>-
>-param ::=
>-.B param
>-name-list
>-.B ;
>-
>-param ::=
>-.B param {
>-param-list
>-.B }
>-
>-param-list ::= [ param-list ] | name-list
>-.B ;
>-
>-name-list ::= [ name-list ] | name
>-
>-name ::= string | double-quoted-string
>-
>-dim ::= integer
>-.B x
>-integer
>-
>-geometry ::= [ integer
>-.B x
>-integer ] [ signed-integer signed-integer ]
>-
>-origin ::=
>-.B @
>-integer
>-.B x
>-integer
>-.RE
>-.PP
>-The name following
>-.B virtual
>-is used as an identifier for the configuration, and may be passed to
>-.B Xdmx
>-using the
>-.B \-config
>-command line option.  The name of a display should be standard X display
>-name, although no checking is performed (e.g., "machine:0").
>-.PP
>-For names, double quotes are optional unless the name is reserved or
>-contains spaces.
>-.PP
>-The first dimension following
>-.B wall
>-is the dimension for tiling (e.g., 2x4 or 4x4).  The second dimension
>-following
>-.B wall
>-is the dimension of each display in the wall (e.g., 1280x1024).
>-.PP
>-The first geometry following
>-.B display
>-is the geometry of the screen window on the backend server.  The second
>-geometry, which is always preceeded by a slash, is the geometry of the
>-root window.  By default, the root window has the same geometry as the
>-screen window.
>-.PP
>-The
>-.B option
>-line can be used to specify any command-line options (e.g.,
>-.BR \-input ).
>-(It cannot be used to specify the name of the front-end display.)  The
>-option line is processed once at server startup, just line command line
>-options.  This behavior may be unexpected.
>-.SH "CONFIGURATION FILE EXAMPLES"
>-Two displays being used for a desktop may be specified in any of the
>-following formats:
>-.RS
>-.nf
>-virtual example0 {
>-    display d0:0 1280x1024 @0x0;
>-    display d1:0 1280x1024 @1280x0;
>-}
>-.sp
>-virtual example1 {
>-    display d0:0 1280x1024;
>-    display d1:0 @1280x0;
>-}
>-.sp
>-virtual example2 {
>-    display "d0:0";
>-    display "d1:0" @1280x0;
>-}
>-.sp
>-virtual example3 { wall 2x1 d0:0 d1:0; }
>-.fi
>-.RE
>-A 4x4 wall of 16 total displays could be specified as follows (if no
>-tiling dimension is specified, an approximate square is used):
>-.RS
>-.nf
>-virtual example4 {
>-    wall d0:0 d1:0 d2:0 d3:0
>-         d4:0 d5:0 d6:0 d7:0
>-         d8:0 d9:0 da:0 db:0
>-         dc:0 dd:0 de:0 df:0;
>-}
>-.fi
>-.RE
>-.SH "FONT PATHS"
>-The font path used by the
>-.I Xdmx
>-front-end server will be propagated to each back-end server,which
>-requires that each back-end server have access to the exact same font
>-paths as the front-end server.  This can be most easily handled by
>-either using a font server (e.g., xfs) or by remotely mounting the font
>-paths on each back-end server, and then setting the
>-.I Xdmx
>-server's default font path with the
>--I "-fontpath"
>-command line option described above.
>-.PP
>-For example, if you specify a font path with the following command line:
>-.RS
>-Xdmx :1 -display d0:0 -fontpath /usr/fonts/75dpi/ -fontpath /usr/fonts/Type1/ +xinerama
>-.RE
>-Then, /usr/fonts/75dpi/ and /usr/fonts/Type1/ must be valid font paths
>-on the
>-.I Xdmx
>-server and all back-end server, which is d0 in this example.
>-.PP
>-Font servers can also be specified with the
>-.I "-fontpath"
>-option.  For example, let's assume that a properly configured font
>-server is running on host d0.  Then, the following command line
>-.RS
>-Xdmx :1 -display d0:0 -display d1:0 -fontpath tcp/d0:7100 +xinerama
>-.RE
>-will initialize the front-end
>-.I Xdmx
>-server and each of the back-end servers to use the font server on d0.
>-.PP
>-Some fonts might not be supported by either the front-end or the
>-back-end servers.  For example, let's assume the front-end
>-.I Xdmx
>-server includes support Type1 fonts, but one of the back-end servers
>-does not.  Let's also assume that the default font path for
>-.I Xdmx
>-includes Type1 fonts in its font path.  Then, when
>-.I Xdmx
>-initializes the default font path to load the default font, the font
>-path that includes Type1 fonts (along with the other default font paths
>-that are used by the
>-.I Xdmx
>-server) is sent to the back-end server that cannot handle Type1 fonts.
>-That back-end server then rejects the font path and sends an error back
>-to the
>-.I Xdmx
>-server.
>-.I Xdmx
>-then prints an error message and exits because it failed to set the
>-default font path and was unable load the default font.
>-.PP
>-To fix this error, the offending font path must be removed from the
>-default font path by using a different
>-.I "-fontpath"
>-command line option.
>-.PP
>-The
>-.I "-fontpath"
>-option can also be added to the configuration file as described above.
>-.SH "COMMAND-LINE EXAMPLES"
>-The back-end machines are d0 and d1, core input is from the pointer and
>-keyboard attached to d0, clients will refer to :1 when opening windows:
>-.RS
>-Xdmx :1 -display d0:0 -display d1:0 +xinerama
>-.RE
>-.PP
>-As above, except with core input from d1:
>-.RS
>-Xdmx :1 -display d0:0 -display d1:0 -input d1:0 +xinerama
>-.RE
>-.PP
>-As above, except with core input from a console window on the local
>-display:
>-.RS
>-Xdmx :1 -display d0:0 -display d1:0 -input :0 +xinerama
>-.RE
>-.PP
>-As above, except with core input from the local keyboard and mouse:
>-.RS
>-Xdmx :1 -display d0:0 -display d1:0 -input local,kbd,ps2 +xinerama
>-.RE
>-Note that local input can be used under Linux while another X session is
>-running on :0 (assuming the user can access the Linux console tty and
>-mouse devices): a new (blank) VC will be used for keyboard input on the
>-local machine and the Ctrl-Alt-F* sequence will be available to change
>-to another VC (possibly back to another X session running on the local
>-machine).  Using Ctrl-Alt-Backspace on the blank VC will terminate the
>-Xdmx session and return to the original VC.
>-.PP
>-This example uses the configuration file shown in the previous section:
>-.RS
>-Xdmx :1 -input :0 +xinerama -configfile filename -config example2
>-.RE
>-With this configuration file line:
>-.RS
>-option -input :0 +xinerama;
>-.RE
>-the command line can be shortened to:
>-.RS
>-Xdmx :1 -configfile filename -config example2
>-.RE
>-.SH "USING THE USB DEVICE DRIVERS"
>-.P
>-The USB device drivers use the devices called
>-.IR /dev/input/event0 ", " /dev/input/event1 ", etc."
>-under Linux.  These devices are driven using the
>-.I evdev
>-Linux kernel module, which is part of the hid suite.  Please note that
>-if you load the
>-.I mousedev
>-or
>-.I kbddev
>-Linux kernel modules, then USB devices will appear as core Linux input
>-devices and you will not be able to select between using the device only
>-as an
>-.I Xdmx
>-core device or an
>-.I Xdmx
>-XInput extension device.  Further, you may be unable to unload the
>-.I mousedev
>-Linux kernel module if
>-.I XFree86
>-is configured to use
>-.I /dev/input/mice
>-as an input device (this is quite helpful for laptop users and is set up
>-by default under some Linux distributions, but should be changed if USB
>-devices are to be used with
>-.IR Xdmx ).
>-.PP
>-The USB device drivers search through the Linux devices for the first
>-mouse, keyboard, or non-mouse-non-keyboard Linux device and use that
>-device.
>-.SH "KEYBOARD INITIALIZATION"
>-.PP
>-If
>-.I Xdmx
>-was invoked with
>-.I \-xkb
>-or was
>-.B not
>-compiled to use the XKEYBOARD extension, then a keyboard on a backend or
>-console will be initialized using the map that the host X server
>-provides.
>-.PP
>-If the XKEYBOARD extension is used for both
>-.I Xdmx
>-and the host X server for the keyboard (i.e., the backend or console X
>-server), then the type of the keyboard will
>-be obtained from the host X server and the keyboard under
>-.I Xdmx
>-will be initialized with that information.  Otherwise, the default type
>-of keyboard will be initialized.  In both cases, the map from the host X
>-server will
>-.B not
>-be used.  This means that different initial behavior may be noted with
>-and without XKEYBOARD.  Consistent and expected results will be obtained
>-by running XKEYBOARD on all servers and by avoiding the use of
>-.I xmodmap
>-on the backend or console X servers prior to starting
>-.IR Xdmx .
>-.PP
>-If
>-.I \-xkbmap
>-is specified on the
>-.I Xdmx
>-command line, then that map will currently be used for all keyboards.
>-.SH "MULTIPLE CORE KEYBOARDS"
>-X was not designed to support multiple core keyboards.  However,
>-.I Xdmx
>-provides some support for multiple core keyboards.  Best results will be
>-obtained if all of the keyboards are of the same type and are using the
>-same keyboard map.  Because the X server passes raw key code information
>-to the X client, key symbols for keyboards with different key maps would
>-be different if the key code for each keyboard was sent without
>-translation to the client.  Therefore,
>-.I Xdmx
>-will attempt to translate the key code from a core keyboard to the key
>-code for the key with the same key symbol of the
>-.B first
>-core keyboard that was loaded.  If the key symbol appears in both maps,
>-the results will be expected.  Otherwise, the second core keyboard will
>-return a NoSymbol key symbol for some keys that would have been
>-translated if it was the first core keyboard.
>-.ig
>-.SH ENVIRONMENT
>-..
>-.ig
>-.SH FILES
>-..
>-.SH "SEE ALSO"
>-.BR DMX "(3X), " X "(__miscmansuffix__), " Xserver "(1), " xdmxconfig "(1), "
>-.BR vdltodmx "(1), " xfs "(1), " xkbcomp (1)
>-.SH AUTHORS
>-Kevin E. Martin
>-.I <kem@redhat.com>,
>-David H. Dawes
>-.I <dawes@xfree86.org>,
>-and
>-Rickard E. (Rik) Faith
>-.IR <faith@redhat.com> .
>-.PP
>-Portions of
>-.I Xdmx
>-are based on code from The XFree86 Project
>-.RI ( http://www.xfree86.org )
>-and X.Org
>-.RI ( http://www.x.org ).
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/dmx/Xdmx.man xorg-server-0.99.4/hw/dmx/Xdmx.man
>--- xorg-server-0.99.3/hw/dmx/Xdmx.man	1969-12-31 16:00:00.000000000 -0800
>+++ xorg-server-0.99.4/hw/dmx/Xdmx.man	2004-06-30 13:06:53.000000000 -0700
>@@ -0,0 +1,741 @@
>+.\" $XFree86$
>+.\"
>+.\" Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
>+.\" All Rights Reserved.
>+.\"
>+.\" Permission is hereby granted, free of charge, to any person obtaining
>+.\" a copy of this software and associated documentation files (the
>+.\" "Software"), to deal in the Software without restriction, including
>+.\" without limitation on the rights to use, copy, modify, merge,
>+.\" publish, distribute, sublicense, and/or sell copies of the Software,
>+.\" and to permit persons to whom the Software is furnished to do so,
>+.\" subject to the following conditions:
>+.\"
>+.\" he above copyright notice and this permission notice (including the
>+.\" next paragraph) shall be included in all copies or substantial
>+.\" portions of the Software.
>+.\"
>+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>+.\" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
>+.\" NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
>+.\" BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
>+.\" ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
>+.\" CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
>+.\" SOFTWARE.
>+.TH Xdmx 1 __vendorversion__
>+.SH NAME
>+Xdmx - Distributed Multi-head X server
>+.SH SYNOPSIS
>+.B Xdmx
>+[:display] [option ...]
>+.SH DESCRIPTION
>+.I Xdmx
>+is a proxy X server that uses one or more other X servers as its display
>+devices.  It provides multi-head X functionality for displays that might
>+be located on different machines.
>+.I Xdmx
>+functions as a front-end X server that acts as a proxy to a set of
>+back-end X servers.  All of the visible rendering is passed to the
>+back-end X servers.  Clients connect to the
>+.I Xdmx
>+front-end, and everything appears as it would in a regular multi-head
>+configuration.  If Xinerama is enabled (e.g., with
>+.B +xinerama
>+on the command line), the clients see a single large screen.
>+.PP
>+.I Xdmx
>+communicates to the back-end X servers using the standard X11 protocol,
>+and standard and/or commonly available X server extensions.
>+.SH OPTIONS
>+In addition to the normal X server options described in the
>+.I Xserver(1)
>+manual page,
>+.I Xdmx
>+accepts the following command line switches:
>+.TP 8
>+.BI "\-display " display-name
>+This specifies the name(s) of the back-end X server display(s) to connect
>+to.  This option may be specified multiple times to connect to more than
>+one back-end display.  The first is used as screen 0, the second as screen 1,
>+etc.  If this option is omitted, the
>+.B $DISPLAY
>+environment variable is used as the single back-end X server display.
>+.sp
>+.TP 8
>+.BI "\-xinput " input-source
>+This specifies the source to use for XInput extension devices.  The
>+choices are the same as for
>+.BR "\-input " ,
>+described below, except that core devices on backend servers cannot be
>+treated as XInput extension devices.  (Although extension devices on
>+backend and console servers are supported as extension devices under
>+.IR Xdmx ).
>+.sp
>+.TP 8
>+.BI "\-input " input-source
>+This specifies the source to use for the core input devices.  The choices are:
>+.RS
>+.TP 4
>+.B dummy
>+A set of dummy core input drivers are used.  These never generate any
>+input events.
>+.sp
>+.TP 4
>+.B local
>+The raw keyboard and pointer from the local computer are used.  A
>+comma-separated list of driver names can be appended.  For example, to
>+select the example Linux keyboard and PS/2 mouse driver use:
>+.BR "-input local,kbd,ps2" .
>+The following drivers have been implemented for Linux: kbd, ms (a
>+two-button Microsoft mouse driver), ps2 (a PS/2 mouse driver), usb-mou
>+(a USB mouse driver), usb-kbd (a USB keyboard driver), and usb-oth (a
>+USB non-keyboard, non-mouse driver).  Additional drivers may be
>+implemented in the future.  Appropriate defaults will be used if no
>+comma-separated list is provided.
>+.sp
>+.TP 4
>+.I display-name
>+If the display-name is a back-end server, then core input events are
>+taken from the server specified.  Otherwise, a console window will be
>+opened on the specified display.
>+.sp
>+If the
>+.I display-name
>+is followed by ",xi" then XInput extension devices on the display will
>+be used as
>+.I Xdmx
>+XInput extension devices.  If the
>+.I display-name
>+is followed by ",noxi" then XInput extension devices on the display will
>+.B not
>+be used as
>+.I Xdmx
>+XInput extension devices.  Currently, the default is ",xi".
>+.sp
>+If the
>+.I display-name
>+is followed by ",console" and the
>+.I display-name
>+refers to a display that is used as a backend display, then a console
>+window will be opened on that display
>+.B and
>+that display will be treated as a backend display.  Otherwise (or if
>+",noconsole" is used), the display will be treated purely as a backend
>+or a console display, as described above.
>+.sp
>+If the
>+.I display-name
>+is followed by ",windows", then outlines of the windows on the backend
>+will be displayed inside the console window.  Otherwise (or if
>+",nowindows" is used), the console window will not display the outlines
>+of backend windows.  (This option only applies to console input.)
>+.sp
>+If the
>+.I display-name
>+is followed by ",xkb", then the next 1 to 3 comma-separated parameters
>+will specify the keycodes, symbols, and geometry of the keyboard for
>+this input device.  For example, ",xkb,xfree86,pc104" will specify that
>+the "xfree86" keycodes and the "pc104" symbols should be used to
>+initialize the keyboard.  For an SGI keyboard, ",xkb,sgi/indy(pc102)"
>+might be useful.  A list of keycodes, symbols, and geometries can be
>+found in
>+.IR /usr/X11R6/lib/X11/xkb .
>+If this option is not specified, the input device will be queried,
>+perhaps using the XKEYBOARD extension.
>+.RE
>+.sp
>+.RS
>+If this option isn't specified, the default input source is the first
>+back-end server (the one used for screen 0).  The console window shows
>+the layout of the back-end display(s) and pointer movements and key
>+presses within the console window will be used as core input devices.
>+.sp
>+Several special function keys are active, depending on the input
>+source:
>+.sp
>+.RS
>+.B Ctrl-Alt-q
>+will terminate the
>+.I Xdmx
>+server in all modes.
>+.sp
>+.B Ctrl-Alt-g
>+will toggle a
>+server grab in console mode (a special cursor, currently a spider, is
>+used to indicate an active server grab).
>+.sp
>+.B Ctrl-Alt-f
>+will toggle fine-grain motion in console mode (a special cursor,
>+currently a cross hair, is used to indicate this mode).  If this mode is
>+combined with a server grab, then the cursor will have 4 lines instead
>+of only 2.
>+.sp
>+.BR Ctrl-Alt-F1 " through " Ctrl-Alt-F12
>+will switch to another VC in local (raw) mode.
>+.RE
>+.RE
>+.sp
>+.TP 8
>+.BI "-shadowfb"
>+This option turns on (legacy) support for the shadow frame buffer.
>+.sp
>+.TP 8
>+.BI "-noshadowfb"
>+This option turns off (legacy) support for the shadow frame buffer.
>+Note that this option has been deprecated and will be removed in the
>+next release.
>+.sp
>+.TP 8
>+.BI "-nomulticursor"
>+This option turns off support for displaying multiple cursors on
>+overlapped back-end displays.  This option is available for testing and
>+benchmarking purposes.
>+.sp
>+.TP 8
>+.BI "-fontpath"
>+This option sets the
>+.I Xdmx
>+server's default font path.  This option can be specified multiple times
>+to accommodate multiple font paths.  See the
>+.B "FONT PATHS"
>+section below for very important information regarding setting the
>+default font path.
>+.sp
>+.TP 8
>+.BI "-configfile " filename
>+Specify the configuration file that should be read.  Note that if the
>+.B \-display
>+command-line option is used, then the configuration file will be
>+ignored.
>+.sp
>+.TP 8
>+.BI "-config " name
>+Specify a configuration to use.  The
>+.I name
>+will be the name following the
>+.B virtual
>+keyword in the configuration file.
>+.sp
>+.TP 8
>+.BI "-stat " "interval screens"
>+This option enables the display of performance statistics.  The interval
>+is in seconds.  The screens is a count of the number of back-end screens
>+for which data is printed each interval.  Specifying 0 for screens will
>+display data for all screens.
>+.sp
>+For each screen, the following information is printed: the screen
>+number, an absolute count of the number of XSync() calls made
>+(SyncCount), the rate of these calls during the previous interval
>+(Sync/s), the average round-trip time (in microseconds) of the last 10
>+XSync() calls (avSync), the maximum round-trip time (in microseconds) of
>+the last 10 XSync calls (mxSync), the average number of XSync() requests
>+that were pending but not yet processed for each of the last 10
>+processed XSync() calls, the maximum number of XSync() requests that
>+were pending but not yet processed for each of the last 10 processed
>+XSync() calls, and a histogram showing the distribution of the times of
>+all of the XSync() calls that were made during the previous interval.
>+.sp
>+(The length of the moving average and the number and value of histogram
>+bins are configurable at compile time in the
>+.B dmxstat.h
>+header file.)
>+.sp
>+.TP 8
>+.BI "-syncbatch " interval
>+This option sets the
>+.I interval
>+in milliseconds for XSync() batching.  An
>+.I interval
>+less than or equal to 0 will disable XSync() batching.  The default
>+.I interval
>+is 100 ms.
>+.sp
>+.TP 8
>+.BI "-nooffscreenopt"
>+This option disables the offscreen optimization.  Since the lazy window
>+creation optimization requires the offscreen optimization to be enabled,
>+this option will also disable the lazy window creation optimization.
>+.sp
>+.TP 8
>+.BI "-nowindowopt"
>+This option disables the lazy window creation optimization.
>+.sp
>+.TP 8
>+.BI "-nosubdivprims"
>+This option disables the primitive subdivision optimization.
>+.sp
>+.TP 8
>+.BI "-noxkb"
>+Disable use of the XKB extension for communication with the back end
>+displays.  (Combine with
>+.B "-kb"
>+to disable all use of XKB.)
>+.sp
>+.TP 8
>+.BI "-depth " int
>+This option sets the root window's default depth.  When choosing a
>+default visual from those available on the back-end X server, the first
>+visual with that matches the depth specified is used.
>+.sp
>+This option can be combined with the
>+.BI "-cc"
>+option, which specifies the default color visual class, to force the use
>+of a specific depth and color class for the root window.
>+.sp
>+.TP 8
>+.BI "-norender"
>+This option disables the RENDER extension.
>+.sp
>+.TP 8
>+.BI "-noglxproxy"
>+This option disables GLX proxy -- the build-in GLX extension
>+implementation that is DMX aware.
>+.sp
>+.TP 8
>+.BI "-noglxswapgroup"
>+This option disables the swap group and swap barrier extensions in GLX
>+proxy.
>+.sp
>+.TP 8
>+.BI "-glxsyncswap"
>+This option enables synchronization after a swap buffers call by waiting
>+until all X protocol has been processed.  When a client issues a
>+glXSwapBuffers request, Xdmx relays that request to each back-end X
>+server, and those requests are buffered along with all other protocol
>+requests.  However, in systems that have large network buffers, this
>+buffering can lead to the set of back-end X servers handling the swap
>+buffers request asynchronously.  With this option, an XSync() request is
>+issued to each back-end X server after sending the swap buffers request.
>+The XSync() requests will flush all buffered protocol (including the
>+swap buffers requests) and wait until the back-end X servers have
>+processed those requests before continuing.  This option does not wait
>+until all GL commands have been processed so there might be previously
>+issued commands that are still being processed in the GL pipe when the
>+XSync() request returns.  See the
>+.BI "-glxfinishswap"
>+option below if Xdmx should wait until the GL commands have been
>+processed.
>+.sp
>+.TP 8
>+.BI "-glxfinishswap"
>+This option enables synchronization after a swap buffers call by waiting
>+until all GL commands have been completed.  It is similar to the
>+.BI "-glxsyncswap"
>+option above; however, instead of issuing an XSync(), it issues a
>+glFinish() request to each back-end X server after sending the swap
>+buffers requests.  The glFinish() request will flush all buffered
>+protocol requests, process both X and GL requests, and wait until all
>+previously called GL commands are complete before returning.
>+.sp
>+.TP 8
>+.BI "-ignorebadfontpaths"
>+This option ignores font paths that are not available on all back-end
>+servers by removing the bad font path(s) from the default font path
>+list.  If no valid font paths are left after removing the bad paths, an
>+error to that effect is printed in the log.
>+.sp
>+.TP 8
>+.BI "-addremovescreens"
>+This option enables the dynamic addition and removal of screens, which
>+is disabled by default.  Note that GLXProxy and Render do not yet
>+support dynamic addition and removal of screens, and must be disabled
>+via the
>+.BI "-noglxproxy"
>+and
>+.BI "-norender"
>+command line options described above.
>+.sp
>+.TP 8
>+.BI "-param"
>+This option specifies parameters on the command line.  Currently, only
>+parameters dealing with XKEYBOARD configuration are supported.  These
>+parameters apply only to the core keyboard.  Parameter values are
>+installation-dependent.  Please see
>+.I /usr/X11R6/lib/X11/xkb
>+or a similar directory for complete information.
>+.RS
>+.TP 8
>+.B XkbRules
>+Defaults to "xfree86".  Other values may include "sgi" and "sun".
>+.sp
>+.TP 8
>+.B XkbModel
>+Defaults to "pc101".  When used with "xfree86" rules, other values may
>+include "pc102", "pc104", "pc105", "microsoft", and many others.  When
>+used with "sun" rules, other values may include "type4" and "type5".
>+.sp
>+.TP 8
>+.B XkbLayout
>+Defaults to "us".  Other country codes and "dvorak" are usually
>+available.
>+.sp
>+.TP 8
>+.B XkbVariant
>+Defaults to "".
>+.sp
>+.TP 8
>+.B XkbOptions
>+Defaults to "".
>+.RE
>+.SH "CONFIGURATION FILE GRAMMAR"
>+The following words and tokens are reserved:
>+.RS
>+.B virtual
>+.B display
>+.B wall
>+.B option
>+.B param
>+.B {
>+.B }
>+.B ;
>+.B #
>+.RE
>+.PP
>+Comments start with a
>+.B #
>+mark and extend to the end of the line.  They may appear anywhere.  If a
>+configuration file is read into
>+.BR xdmxconfig ,
>+the comments in that file will be preserved, but will not be editable.
>+.PP
>+The grammar is as follows:
>+.RS
>+virtual-list ::= [ virtual-list ] | virtual
>+
>+virtual ::=
>+.B virtual
>+[ name ] [ dim ]
>+.B {
>+dw-list
>+.B }
>+
>+dw-list ::= [ dw-list ] | dw
>+
>+dw ::= display | wall | option
>+
>+display ::=
>+.B display
>+name [ geometry ] [ / geometry ] [ origin ]
>+.B ;
>+
>+wall ::=
>+.B wall
>+[ dim ] [ dim ] name-list
>+.B ;
>+
>+option ::=
>+.B option
>+name-list
>+.B ;
>+
>+param ::=
>+.B param
>+name-list
>+.B ;
>+
>+param ::=
>+.B param {
>+param-list
>+.B }
>+
>+param-list ::= [ param-list ] | name-list
>+.B ;
>+
>+name-list ::= [ name-list ] | name
>+
>+name ::= string | double-quoted-string
>+
>+dim ::= integer
>+.B x
>+integer
>+
>+geometry ::= [ integer
>+.B x
>+integer ] [ signed-integer signed-integer ]
>+
>+origin ::=
>+.B @
>+integer
>+.B x
>+integer
>+.RE
>+.PP
>+The name following
>+.B virtual
>+is used as an identifier for the configuration, and may be passed to
>+.B Xdmx
>+using the
>+.B \-config
>+command line option.  The name of a display should be standard X display
>+name, although no checking is performed (e.g., "machine:0").
>+.PP
>+For names, double quotes are optional unless the name is reserved or
>+contains spaces.
>+.PP
>+The first dimension following
>+.B wall
>+is the dimension for tiling (e.g., 2x4 or 4x4).  The second dimension
>+following
>+.B wall
>+is the dimension of each display in the wall (e.g., 1280x1024).
>+.PP
>+The first geometry following
>+.B display
>+is the geometry of the screen window on the backend server.  The second
>+geometry, which is always preceeded by a slash, is the geometry of the
>+root window.  By default, the root window has the same geometry as the
>+screen window.
>+.PP
>+The
>+.B option
>+line can be used to specify any command-line options (e.g.,
>+.BR \-input ).
>+(It cannot be used to specify the name of the front-end display.)  The
>+option line is processed once at server startup, just line command line
>+options.  This behavior may be unexpected.
>+.SH "CONFIGURATION FILE EXAMPLES"
>+Two displays being used for a desktop may be specified in any of the
>+following formats:
>+.RS
>+.nf
>+virtual example0 {
>+    display d0:0 1280x1024 @0x0;
>+    display d1:0 1280x1024 @1280x0;
>+}
>+.sp
>+virtual example1 {
>+    display d0:0 1280x1024;
>+    display d1:0 @1280x0;
>+}
>+.sp
>+virtual example2 {
>+    display "d0:0";
>+    display "d1:0" @1280x0;
>+}
>+.sp
>+virtual example3 { wall 2x1 d0:0 d1:0; }
>+.fi
>+.RE
>+A 4x4 wall of 16 total displays could be specified as follows (if no
>+tiling dimension is specified, an approximate square is used):
>+.RS
>+.nf
>+virtual example4 {
>+    wall d0:0 d1:0 d2:0 d3:0
>+         d4:0 d5:0 d6:0 d7:0
>+         d8:0 d9:0 da:0 db:0
>+         dc:0 dd:0 de:0 df:0;
>+}
>+.fi
>+.RE
>+.SH "FONT PATHS"
>+The font path used by the
>+.I Xdmx
>+front-end server will be propagated to each back-end server,which
>+requires that each back-end server have access to the exact same font
>+paths as the front-end server.  This can be most easily handled by
>+either using a font server (e.g., xfs) or by remotely mounting the font
>+paths on each back-end server, and then setting the
>+.I Xdmx
>+server's default font path with the
>+-I "-fontpath"
>+command line option described above.
>+.PP
>+For example, if you specify a font path with the following command line:
>+.RS
>+Xdmx :1 -display d0:0 -fontpath /usr/fonts/75dpi/ -fontpath /usr/fonts/Type1/ +xinerama
>+.RE
>+Then, /usr/fonts/75dpi/ and /usr/fonts/Type1/ must be valid font paths
>+on the
>+.I Xdmx
>+server and all back-end server, which is d0 in this example.
>+.PP
>+Font servers can also be specified with the
>+.I "-fontpath"
>+option.  For example, let's assume that a properly configured font
>+server is running on host d0.  Then, the following command line
>+.RS
>+Xdmx :1 -display d0:0 -display d1:0 -fontpath tcp/d0:7100 +xinerama
>+.RE
>+will initialize the front-end
>+.I Xdmx
>+server and each of the back-end servers to use the font server on d0.
>+.PP
>+Some fonts might not be supported by either the front-end or the
>+back-end servers.  For example, let's assume the front-end
>+.I Xdmx
>+server includes support Type1 fonts, but one of the back-end servers
>+does not.  Let's also assume that the default font path for
>+.I Xdmx
>+includes Type1 fonts in its font path.  Then, when
>+.I Xdmx
>+initializes the default font path to load the default font, the font
>+path that includes Type1 fonts (along with the other default font paths
>+that are used by the
>+.I Xdmx
>+server) is sent to the back-end server that cannot handle Type1 fonts.
>+That back-end server then rejects the font path and sends an error back
>+to the
>+.I Xdmx
>+server.
>+.I Xdmx
>+then prints an error message and exits because it failed to set the
>+default font path and was unable load the default font.
>+.PP
>+To fix this error, the offending font path must be removed from the
>+default font path by using a different
>+.I "-fontpath"
>+command line option.
>+.PP
>+The
>+.I "-fontpath"
>+option can also be added to the configuration file as described above.
>+.SH "COMMAND-LINE EXAMPLES"
>+The back-end machines are d0 and d1, core input is from the pointer and
>+keyboard attached to d0, clients will refer to :1 when opening windows:
>+.RS
>+Xdmx :1 -display d0:0 -display d1:0 +xinerama
>+.RE
>+.PP
>+As above, except with core input from d1:
>+.RS
>+Xdmx :1 -display d0:0 -display d1:0 -input d1:0 +xinerama
>+.RE
>+.PP
>+As above, except with core input from a console window on the local
>+display:
>+.RS
>+Xdmx :1 -display d0:0 -display d1:0 -input :0 +xinerama
>+.RE
>+.PP
>+As above, except with core input from the local keyboard and mouse:
>+.RS
>+Xdmx :1 -display d0:0 -display d1:0 -input local,kbd,ps2 +xinerama
>+.RE
>+Note that local input can be used under Linux while another X session is
>+running on :0 (assuming the user can access the Linux console tty and
>+mouse devices): a new (blank) VC will be used for keyboard input on the
>+local machine and the Ctrl-Alt-F* sequence will be available to change
>+to another VC (possibly back to another X session running on the local
>+machine).  Using Ctrl-Alt-Backspace on the blank VC will terminate the
>+Xdmx session and return to the original VC.
>+.PP
>+This example uses the configuration file shown in the previous section:
>+.RS
>+Xdmx :1 -input :0 +xinerama -configfile filename -config example2
>+.RE
>+With this configuration file line:
>+.RS
>+option -input :0 +xinerama;
>+.RE
>+the command line can be shortened to:
>+.RS
>+Xdmx :1 -configfile filename -config example2
>+.RE
>+.SH "USING THE USB DEVICE DRIVERS"
>+.P
>+The USB device drivers use the devices called
>+.IR /dev/input/event0 ", " /dev/input/event1 ", etc."
>+under Linux.  These devices are driven using the
>+.I evdev
>+Linux kernel module, which is part of the hid suite.  Please note that
>+if you load the
>+.I mousedev
>+or
>+.I kbddev
>+Linux kernel modules, then USB devices will appear as core Linux input
>+devices and you will not be able to select between using the device only
>+as an
>+.I Xdmx
>+core device or an
>+.I Xdmx
>+XInput extension device.  Further, you may be unable to unload the
>+.I mousedev
>+Linux kernel module if
>+.I XFree86
>+is configured to use
>+.I /dev/input/mice
>+as an input device (this is quite helpful for laptop users and is set up
>+by default under some Linux distributions, but should be changed if USB
>+devices are to be used with
>+.IR Xdmx ).
>+.PP
>+The USB device drivers search through the Linux devices for the first
>+mouse, keyboard, or non-mouse-non-keyboard Linux device and use that
>+device.
>+.SH "KEYBOARD INITIALIZATION"
>+.PP
>+If
>+.I Xdmx
>+was invoked with
>+.I \-xkb
>+or was
>+.B not
>+compiled to use the XKEYBOARD extension, then a keyboard on a backend or
>+console will be initialized using the map that the host X server
>+provides.
>+.PP
>+If the XKEYBOARD extension is used for both
>+.I Xdmx
>+and the host X server for the keyboard (i.e., the backend or console X
>+server), then the type of the keyboard will
>+be obtained from the host X server and the keyboard under
>+.I Xdmx
>+will be initialized with that information.  Otherwise, the default type
>+of keyboard will be initialized.  In both cases, the map from the host X
>+server will
>+.B not
>+be used.  This means that different initial behavior may be noted with
>+and without XKEYBOARD.  Consistent and expected results will be obtained
>+by running XKEYBOARD on all servers and by avoiding the use of
>+.I xmodmap
>+on the backend or console X servers prior to starting
>+.IR Xdmx .
>+.PP
>+If
>+.I \-xkbmap
>+is specified on the
>+.I Xdmx
>+command line, then that map will currently be used for all keyboards.
>+.SH "MULTIPLE CORE KEYBOARDS"
>+X was not designed to support multiple core keyboards.  However,
>+.I Xdmx
>+provides some support for multiple core keyboards.  Best results will be
>+obtained if all of the keyboards are of the same type and are using the
>+same keyboard map.  Because the X server passes raw key code information
>+to the X client, key symbols for keyboards with different key maps would
>+be different if the key code for each keyboard was sent without
>+translation to the client.  Therefore,
>+.I Xdmx
>+will attempt to translate the key code from a core keyboard to the key
>+code for the key with the same key symbol of the
>+.B first
>+core keyboard that was loaded.  If the key symbol appears in both maps,
>+the results will be expected.  Otherwise, the second core keyboard will
>+return a NoSymbol key symbol for some keys that would have been
>+translated if it was the first core keyboard.
>+.ig
>+.SH ENVIRONMENT
>+..
>+.ig
>+.SH FILES
>+..
>+.SH "SEE ALSO"
>+.BR DMX "(3X), " X "(__miscmansuffix__), " Xserver "(1), " xdmxconfig "(1), "
>+.BR vdltodmx "(1), " xfs "(1), " xkbcomp (1)
>+.SH AUTHORS
>+Kevin E. Martin
>+.I <kem@redhat.com>,
>+David H. Dawes
>+.I <dawes@xfree86.org>,
>+and
>+Rickard E. (Rik) Faith
>+.IR <faith@redhat.com> .
>+.PP
>+Portions of
>+.I Xdmx
>+are based on code from The XFree86 Project
>+.RI ( http://www.xfree86.org )
>+and X.Org
>+.RI ( http://www.x.org ).
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/vfb/Makefile.am xorg-server-0.99.4/hw/vfb/Makefile.am
>--- xorg-server-0.99.3/hw/vfb/Makefile.am	2005-10-06 13:16:13.000000000 -0700
>+++ xorg-server-0.99.4/hw/vfb/Makefile.am	2005-12-01 22:02:40.000000000 -0800
>@@ -21,14 +21,24 @@
> AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
>             -DNO_HW_ONLY_EXTS \
>             -DNO_MODULE_EXTS \
>-            -DXFree86Server \
>+            @SERVER_DEFINES@ \
>             $(XVFBMODULES_CFLAGS)
> 
> # Man page
> include $(top_srcdir)/cpprules.in
> 
>-man1_MANS = Xvfb.man
>+appmandir = $(APP_MAN_DIR)
> 
>-CLEANFILES = $(man1_MANS)
>+appman_SOURCES = Xvfb.man
>+appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
>+
>+BUILT_SOURCES = $(appman_SOURCES)
>+CLEANFILES = $(appman_SOURCES) $(appman_DATA)
>+
>+SUFFIXES += .$(APP_MAN_SUFFIX) .man
>+
>+.man.$(APP_MAN_SUFFIX):
>+	-rm -f $@
>+	$(LN_S) $< $@
> 
> EXTRA_DIST = Xvfb.man.pre
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/common/Makefile.am xorg-server-0.99.4/hw/xfree86/common/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/common/Makefile.am	2005-10-12 04:15:44.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/common/Makefile.am	2005-12-01 22:02:40.000000000 -0800
>@@ -98,4 +98,4 @@
> 	modeline2c.pl \
>         $(DISTKBDSOURCES)
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/common/xf86Build.h xorg-server-0.99.4/hw/xfree86/common/xf86Build.h
>--- xorg-server-0.99.3/hw/xfree86/common/xf86Build.h	2005-11-09 23:57:01.000000000 -0800
>+++ xorg-server-0.99.4/hw/xfree86/common/xf86Build.h	2005-12-03 16:54:03.000000000 -0800
>@@ -1 +1 @@
>-#define BUILD_DATE 20051110
>+#define BUILD_DATE 20051203
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/common/xf86Configure.c xorg-server-0.99.4/hw/xfree86/common/xf86Configure.c
>--- xorg-server-0.99.3/hw/xfree86/common/xf86Configure.c	2005-11-07 22:33:28.000000000 -0800
>+++ xorg-server-0.99.4/hw/xfree86/common/xf86Configure.c	2005-11-14 10:49:30.000000000 -0800
>@@ -317,11 +317,9 @@
> #ifndef __SCO__
>     mouse->inp_option_lst = 
> 		xf86addNewOption(mouse->inp_option_lst, "Device", DFLT_MOUSE_DEV);
>-#ifndef __UNIXWARE__
>+#endif
>     mouse->inp_option_lst = 
> 		xf86addNewOption(mouse->inp_option_lst, "ZAxisMapping", "4 5 6 7");
>-#endif
>-#endif
>     ptr = (XF86ConfInputPtr)xf86addListItem((glp)ptr, (glp)mouse);
>     return ptr;
> }
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/ddc/Makefile.am xorg-server-0.99.4/hw/xfree86/ddc/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/ddc/Makefile.am	2005-09-30 23:19:01.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/ddc/Makefile.am	2005-12-01 22:02:40.000000000 -0800
>@@ -8,6 +8,6 @@
> 
> INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> EXTRA_DIST = ddcPriv.h DDC.HOWTO
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/ddc/xf86DDC.c xorg-server-0.99.4/hw/xfree86/ddc/xf86DDC.c
>--- xorg-server-0.99.3/hw/xfree86/ddc/xf86DDC.c	2005-07-03 01:53:43.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/ddc/xf86DDC.c	2005-11-18 10:02:24.000000000 -0800
>@@ -216,12 +216,15 @@
> #ifdef DEBUG
>     if (!tmp)
> 	ErrorF("Cannot interpret EDID block\n");
>-    ErrorF("Sections to follow: %i\n",tmp->no_sections);
>+    else
>+        ErrorF("Sections to follow: %i\n",tmp->no_sections);
> #endif
>-    VDIF_Block = 
>-	VDIFRead(scrnIndex, pBus, EDID1_LEN * (tmp->no_sections + 1));    
>-    tmp->vdif = xf86InterpretVdif(VDIF_Block);
>-
>+    if (tmp) {
>+        VDIF_Block = 
>+            VDIFRead(scrnIndex, pBus, EDID1_LEN * (tmp->no_sections + 1));    
>+        tmp->vdif = xf86InterpretVdif(VDIF_Block);
>+    }
>+    
>     return tmp;
> }
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/dixmods/extmod/Makefile.am xorg-server-0.99.4/hw/xfree86/dixmods/extmod/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/dixmods/extmod/Makefile.am	2005-11-09 23:46:07.000000000 -0800
>+++ xorg-server-0.99.4/hw/xfree86/dixmods/extmod/Makefile.am	2005-12-01 22:02:40.000000000 -0800
>@@ -1,6 +1,7 @@
> sdk_HEADERS = dgaproc.h
> 
>-module_LTLIBRARIES = libextmod.la
>+extsmoduledir = $(moduledir)/extensions
>+extsmodule_LTLIBRARIES = libextmod.la
> 
> if DGA
> DGA_SRCS = xf86dga.c xf86dga2.c dgaproc.h xf86dgaext.h
>@@ -10,7 +11,7 @@
> XV_SRCS = xvmod.c xvmodproc.h
> endif
> 
>-AM_CFLAGS = @XORG_CFLAGS@ -DEXTMODULE
>+AM_CFLAGS = @XORG_CFLAGS@ -DEXTMODULE @SERVER_DEFINES@ @LOADER_DEFINES@
> INCLUDES = @XORG_INCS@ \
>            -I$(top_srcdir)/afb \
>            -I$(top_srcdir)/mfb \
>@@ -29,4 +30,4 @@
>                        xf86vmode.c \
>                        vidmodeproc.h \
>                        $(XV_SRCS)
>-libextmod_la_LIBADD = $(top_builddir)/Xext/libXext.la
>+libextmod_la_LIBADD = $(top_builddir)/Xext/libXextmodule.la
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/dixmods/Makefile.am xorg-server-0.99.4/hw/xfree86/dixmods/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/dixmods/Makefile.am	2005-10-20 11:52:51.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/dixmods/Makefile.am	2005-12-03 09:04:45.000000000 -0800
>@@ -6,28 +6,37 @@
> GLXMODS = libglx.la libGLcore.la
> endif
> 
>-# if XTRAP
>-# XTRAPMOD = libxtrap.la
>-# endif
>+if XTRAP
>+XTRAPMOD = libxtrap.la
>+endif
>+
>+# cfb24 is only used by xf8_32wid, which is only used by sunffb on SPARC
>+if BUILD_XF8_32WID
>+CFB24MOD = libcfb24.la
>+endif
> 
> module_LTLIBRARIES = libafb.la \
>-                     libbitmap.la \
>                      libcfb.la \
>                      libcfb16.la \
>-                     libcfb24.la \
>+                     $(CFB24MOD) \
>                      libcfb32.la \
>-                     libdbe.la \
>                      libfb.la \
>                      liblayer.la \
>                      libmfb.la \
>-                     librecord.la \
>-                     libshadow.la \
>-		     libfreetype.la \
>-                     libtype1.la \
>-                     $(GLXMODS)
>-#                    $(XTRAPMOD)
>+                     libshadow.la
>+
>+extsmoduledir = $(moduledir)/extensions
>+extsmodule_LTLIBRARIES = libdbe.la \
>+                         librecord.la \
>+                         $(GLXMODS) \
>+                         $(XTRAPMOD)
>+
>+fontsmoduledir = $(moduledir)/fonts
>+fontsmodule_LTLIBRARIES = libbitmap.la \
>+                          libfreetype.la \
>+                          libtype1.la
> 
>-AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
>+AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@
> INCLUDES = @XORG_INCS@ \
>            -I$(top_srcdir)/afb \
>            -I$(top_srcdir)/cfb \
>@@ -67,10 +76,9 @@
> libcfb32_la_SOURCES = cfb32module.c
> 
> libdbe_la_LDFLAGS = -avoid-version
>-libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la
>+libdbe_la_LIBADD = $(top_builddir)/dbe/libdbemodule.la
> libdbe_la_SOURCES = dbemodule.c
> 
>-libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS)
> libfb_la_LDFLAGS = -avoid-version
> libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
> libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c
>@@ -88,7 +96,7 @@
> libmfb_la_SOURCES = mfbmodule.c
> 
> librecord_la_LDFLAGS = -avoid-version
>-librecord_la_LIBADD = $(top_builddir)/record/librecord.la
>+librecord_la_LIBADD = $(top_builddir)/record/librecordmodule.la
> librecord_la_SOURCES = recordmod.c
> 
> libshadow_la_LDFLAGS = -avoid-version
>@@ -105,11 +113,9 @@
> 
> libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
> 
>-# XXX NOTYET
>-# libxtrap_la_LDFLAGS = -avoid-version
>-# libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la
>-# libxtrap_la_SOURCES = xf86XTrapModule.c
>-EXTRA_DIST = xf86XTrapModule.c
>+libxtrap_la_LDFLAGS = -avoid-version
>+libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrapmodule.la
>+libxtrap_la_SOURCES = xf86XTrapModule.c
> 
> xkb%.c:
> 	echo "#define XF86DDXACTIONS" > $@
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/doc/man/Makefile.am xorg-server-0.99.4/hw/xfree86/doc/man/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/doc/man/Makefile.am	2005-10-15 13:44:43.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/doc/man/Makefile.am	2005-11-28 14:05:08.000000000 -0800
>@@ -1,11 +1,16 @@
> # Xserver.man covers options generic to all X servers built in this tree
> MAN_SRCS = Xorg.man.pre xorg.conf.man.pre
> 
>-man1_MANS = Xorg.man
>+appmandir = $(APP_MAN_DIR)
>+appman_DATA = Xorg.$(APP_MAN_SUFFIX)
> 
>-filemandir = $(mandir)/man$(FILE_MAN_SUFFIX)
>+filemandir = $(FILE_MAN_DIR)
> fileman_DATA = xorg.conf.$(FILE_MAN_SUFFIX)
> 
>+Xorg.$(APP_MAN_SUFFIX): Xorg.man
>+	-rm -f Xorg.$(APP_MAN_SUFFIX)
>+	$(LN_S) Xorg.man Xorg.$(APP_MAN_SUFFIX)
>+
> xorg.conf.$(FILE_MAN_SUFFIX): xorg.conf.man
> 	-rm -f xorg.conf.$(FILE_MAN_SUFFIX)
> 	$(LN_S) xorg.conf.man xorg.conf.$(FILE_MAN_SUFFIX)
>@@ -14,6 +19,6 @@
> 
> EXTRAMANDEFS = -D__logdir__=$(logdir)
> 
>-CLEANFILES = $(man1_MANS) $(fileman_DATA) xorg.conf.man
>+CLEANFILES = $(appman_DATA) $(fileman_DATA) xorg.conf.man Xorg.man
> 
> EXTRA_DIST = $(MAN_SRCS)
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/dri/Makefile.am xorg-server-0.99.4/hw/xfree86/dri/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/dri/Makefile.am	2005-11-01 07:01:51.000000000 -0800
>+++ xorg-server-0.99.4/hw/xfree86/dri/Makefile.am	2005-12-01 22:02:40.000000000 -0800
>@@ -7,7 +7,9 @@
>                    -I$(top_builddir)/GL/include \
> 		   -I@MESA_SOURCE@/include \
>                    -DHAVE_XORG_CONFIG_H \
>-		   -DXFree86Module -DIN_MODULE \
>+		   @SERVER_DEFINES@ \
>+		   @MODULE_DEFINES@ \
>+                   @LOADER_DEFINES@ \
>                    @DRIPROTO_CFLAGS@ \
>                    @LIBDRM_CFLAGS@ \
>                    @GL_CFLAGS@
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/dri/xf86dri.c xorg-server-0.99.4/hw/xfree86/dri/xf86dri.c
>--- xorg-server-0.99.3/hw/xfree86/dri/xf86dri.c	2005-09-24 11:45:45.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/dri/xf86dri.c	2005-11-18 15:34:04.000000000 -0800
>@@ -212,7 +212,11 @@
>                   ((rep.busIdStringLength + 3) & ~3)) >> 2;
> 
>     rep.hSAREALow  = (CARD32)(hSAREA & 0xffffffff);
>+#if defined(LONG64) && !defined(__linux__)
>+    rep.hSAREAHigh = (CARD32)(hSAREA >> 32);
>+#else
>     rep.hSAREAHigh = 0;
>+#endif
> 
>     WriteToClient(client, sizeof(xXF86DRIOpenConnectionReply), (char *)&rep);
>     if (rep.busIdStringLength)
>@@ -546,7 +550,11 @@
>     }
> 
>     rep.hFrameBufferLow  = (CARD32)(hFrameBuffer & 0xffffffff);
>+#if defined(LONG64) && !defined(__linux__)
>+    rep.hFrameBufferHigh = (CARD32)(hFrameBuffer >> 32);
>+#else
>     rep.hFrameBufferHigh = 0;
>+#endif
> 
>     rep.length = 0;
>     if (rep.devPrivateSize) {
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/dummylib/Makefile.am xorg-server-0.99.4/hw/xfree86/dummylib/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/dummylib/Makefile.am	2005-09-27 16:28:46.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/dummylib/Makefile.am	2005-12-01 22:02:41.000000000 -0800
>@@ -6,24 +6,18 @@
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>-
>-if NEED_STRLCAT
>-STRL_SRCS = strlcat.c strlcpy.c
>-endif
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> libdummy_a_SOURCES = getvalidbios.c \
>                      pcitestmulti.c xf86allocscripi.c \
>                      xf86addrestolist.c xf86drvmsg.c xf86drvmsgverb.c \
>                      xf86getverb.c \
>                      xf86opt.c xf86screens.c xf86servisinit.c xf86verbose.c \
>-		     $(STRL_SRCS)
>                      #xf86errorf.c xf86errorfverb.c xf86msg.c xf86msgverb.c \
>                      #logvwrite.c verrorf.c xf86info.c xalloc.c fatalerror.c \
>                      #$(srcdir)/../os-support/shared/sigiostubs.c
> 
> libdummy_nonserver_a_SOURCES = \
>-	$(STRL_SRCS) \
> 	fatalerror.c \
> 	getvalidbios.c \
> 	logvwrite.c \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/dummylib/strlcat.c xorg-server-0.99.4/hw/xfree86/dummylib/strlcat.c
>--- xorg-server-0.99.3/hw/xfree86/dummylib/strlcat.c	2005-07-03 00:01:01.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/dummylib/strlcat.c	1969-12-31 16:00:00.000000000 -0800
>@@ -1,61 +0,0 @@
>-/*	$OpenBSD: strlcat.c,v 1.10 2003/04/12 21:56:39 millert Exp $	*/
>-
>-/*
>- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
>- *
>- * Permission to use, copy, modify, and distribute this software for any
>- * purpose with or without fee is hereby granted, provided that the above
>- * copyright notice and this permission notice appear in all copies.
>- *
>- * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
>- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
>- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
>- * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
>- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
>- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
>- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>- */
>-/* $XFree86$ */
>-
>-
>-#ifdef HAVE_XORG_CONFIG_H
>-#include <xorg-config.h>
>-#endif
>-
>-#include <sys/types.h>
>-#include <string.h>
>-
>-/*
>- * Appends src to string dst of size siz (unlike strncat, siz is the
>- * full size of dst, not space left).  At most siz-1 characters
>- * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
>- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
>- * If retval >= siz, truncation occurred.
>- */
>-size_t
>-strlcat(char *dst, const char *src, size_t siz)
>-{
>-	register char *d = dst;
>-	register const char *s = src;
>-	register size_t n = siz;
>-	size_t dlen;
>-
>-	/* Find the end of dst and adjust bytes left but don't go past end */
>-	while (n-- != 0 && *d != '\0')
>-		d++;
>-	dlen = d - dst;
>-	n = siz - dlen;
>-
>-	if (n == 0)
>-		return(dlen + strlen(s));
>-	while (*s != '\0') {
>-		if (n != 1) {
>-			*d++ = *s;
>-			n--;
>-		}
>-		s++;
>-	}
>-	*d = '\0';
>-
>-	return(dlen + (s - src));	/* count does not include NUL */
>-}
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/dummylib/strlcpy.c xorg-server-0.99.4/hw/xfree86/dummylib/strlcpy.c
>--- xorg-server-0.99.3/hw/xfree86/dummylib/strlcpy.c	2005-07-03 00:01:01.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/dummylib/strlcpy.c	1969-12-31 16:00:00.000000000 -0800
>@@ -1,56 +0,0 @@
>-/*	$OpenBSD: strlcpy.c,v 1.7 2003/04/12 21:56:39 millert Exp $	*/
>-
>-/*
>- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
>- *
>- * Permission to use, copy, modify, and distribute this software for any
>- * purpose with or without fee is hereby granted, provided that the above
>- * copyright notice and this permission notice appear in all copies.
>- *
>- * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
>- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
>- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
>- * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
>- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
>- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
>- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>- */
>-/* $XFree86$ */
>-
>-#ifdef HAVE_XORG_CONFIG_H
>-#include <xorg-config.h>
>-#endif
>-
>-#include <sys/types.h>
>-#include <string.h>
>-
>-/*
>- * Copy src to string dst of size siz.  At most siz-1 characters
>- * will be copied.  Always NUL terminates (unless siz == 0).
>- * Returns strlen(src); if retval >= siz, truncation occurred.
>- */
>-size_t
>-strlcpy(char *dst, const char *src, size_t siz)
>-{
>-	register char *d = dst;
>-	register const char *s = src;
>-	register size_t n = siz;
>-
>-	/* Copy as many bytes as will fit */
>-	if (n != 0 && --n != 0) {
>-		do {
>-			if ((*d++ = *s++) == 0)
>-				break;
>-		} while (--n != 0);
>-	}
>-
>-	/* Not enough room in dst, add NUL and traverse rest of src */
>-	if (n == 0) {
>-		if (siz != 0)
>-			*d = '\0';		/* NUL-terminate dst */
>-		while (*s++)
>-			;
>-	}
>-
>-	return(s - src - 1);	/* count does not include NUL */
>-}
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/exa/Makefile.am xorg-server-0.99.4/hw/xfree86/exa/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/exa/Makefile.am	2005-10-02 01:53:18.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/exa/Makefile.am	2005-12-01 22:02:41.000000000 -0800
>@@ -8,7 +8,7 @@
> 	$(XORG_INCS) \
> 	-I$(srcdir)/../../../miext/cw
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> libexa_la_SOURCES = \
> 	exaasync.c \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/fbdevhw/Makefile.am xorg-server-0.99.4/hw/xfree86/fbdevhw/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/fbdevhw/Makefile.am	2005-10-05 17:34:29.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/fbdevhw/Makefile.am	2005-12-01 22:02:41.000000000 -0800
>@@ -1,4 +1,5 @@
>-module_LTLIBRARIES = libfbdevhw.la
>+linuxmoduledir = $(moduledir)/linux
>+linuxmodule_LTLIBRARIES = libfbdevhw.la
> 
> libfbdevhw_la_LDFLAGS = -avoid-version
> 
>@@ -10,13 +11,13 @@
> 
> INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> sdk_HEADERS = fbdevhw.h
> 
> include $(top_srcdir)/cpprules.in
> 
>-drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
>+drivermandir = $(DRIVER_MAN_DIR)
> driverman_DATA = fbdevhw.$(DRIVER_MAN_SUFFIX)
> CLEANFILES = $(driverman_DATA) fbdevhw.man
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/getconfig/Makefile.am xorg-server-0.99.4/hw/xfree86/getconfig/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/getconfig/Makefile.am	2005-10-05 17:34:29.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/getconfig/Makefile.am	2005-11-28 14:05:08.000000000 -0800
>@@ -31,17 +31,26 @@
> getconfigdir = $(libdir)/X11/getconfig
> dist_getconfig_DATA = xorg.cfg cfg.sample
> 
>-man1_MANS = getconfig.man
>-
> include $(top_srcdir)/cpprules.in
> 
>-filemandir = $(mandir)/man$(FILE_MAN_SUFFIX)
>+appmandir = $(APP_MAN_DIR)
>+appman_SOURCES = getconfig.man
>+appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
>+
>+filemandir = $(FILE_MAN_DIR)
> fileman_DATA = getconfig.$(FILE_MAN_SUFFIX)
> 
> getconfig.$(FILE_MAN_SUFFIX): cfg.man
> 	-rm -f getconfig.$(FILE_MAN_SUFFIX)
> 	$(LN_S) cfg.man getconfig.$(FILE_MAN_SUFFIX)
> 
>-CLEANFILES = $(fileman_DATA) cfg.man getconfig.man
>+SUFFIXES += .$(APP_MAN_SUFFIX) .man
>+
>+.man.$(APP_MAN_SUFFIX):
>+	-rm -f $@
>+	$(LN_S) $< $@
>+
>+BUILT_SOURCES = $(appman_SOURCES)
>+CLEANFILES = $(appman_SOURCES) $(appman_DATA) $(fileman_DATA) cfg.man
> 
> EXTRA_DIST = cfg.man.pre getconfig.man.pre
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/i2c/Makefile.am xorg-server-0.99.4/hw/xfree86/i2c/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/i2c/Makefile.am	2005-09-01 07:56:35.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/i2c/Makefile.am	2005-12-01 22:02:41.000000000 -0800
>@@ -1,6 +1,7 @@
>+module_LTLIBRARIES = libi2c.la
>+
> multimediadir = $(moduledir)/multimedia
> multimedia_LTLIBRARIES =	\
>-	libi2c.la		\
> 	bt829_drv.la		\
> 	fi1236_drv.la		\
> 	msp3430_drv.la		\
>@@ -14,7 +15,7 @@
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h i2c_def.h
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/int10/Makefile.am xorg-server-0.99.4/hw/xfree86/int10/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/int10/Makefile.am	2005-09-30 23:19:02.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/int10/Makefile.am	2005-12-01 22:02:41.000000000 -0800
>@@ -2,10 +2,12 @@
> 
> sdk_HEADERS = xf86int10.h
> 
>+EXTRA_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
> libint10_la_LDFLAGS = -avoid-version
> 
> if INT10_VM86
>-AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS)
>+AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
> INCLUDES = $(XORG_INCS)
> libint10_la_SOURCES = \
> 	helper_exec.c \
>@@ -18,14 +20,14 @@
> endif
> 
> if INT10_X86EMU
>-AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS)
>+AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS) $(EXTRA_CFLAGS)
> INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
> libint10_la_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \
> 	xf86int10.c xf86x86emu.c generic.c x86emu.c
> endif
> 
> if INT10_STUB
>-AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS)
>+AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
> libint10_la_SOURCES = stub.c xf86int10module.c
> endif
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/loader/Makefile.am xorg-server-0.99.4/hw/xfree86/loader/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/loader/Makefile.am	2005-10-17 21:03:01.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/loader/Makefile.am	2005-12-01 22:02:41.000000000 -0800
>@@ -7,7 +7,7 @@
>            -I$(srcdir)/../../../miext/damage
> 
> #AM_LDFLAGS = -r
>-AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS)
>+AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> if XORG_LOADER_SPARC
> SPARC_SOURCES = SparcMulDiv.S
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/Makefile.am xorg-server-0.99.4/hw/xfree86/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/Makefile.am	2005-10-28 17:12:32.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/Makefile.am	2005-12-03 09:04:45.000000000 -0800
>@@ -4,11 +4,14 @@
> 
> DOC_SUBDIR = doc
> 
>+if BUILD_XF8_32WID
>+XF8_32WID_SUBDIR=xf8_32wid
>+endif
> 
> SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
>           ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
>-	  xf8_32bpp xf8_32wid loader scanpci dixmods exa $(DRI_SUBDIR) utils \
>-	  $(DOC_SUBDIR) getconfig
>+	  xf8_32bpp $(XF8_32WID_SUBDIR) loader scanpci dixmods exa \
>+	  $(DRI_SUBDIR) utils $(DOC_SUBDIR) getconfig
> 
> DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
>                parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \
>@@ -17,7 +20,7 @@
> 
> bin_PROGRAMS = Xorg
> 
>-AM_CFLAGS = @XORG_CFLAGS@
>+AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@
> INCLUDES = @XORG_INCS@ 
> 
> Xorg_SOURCES = xorg.c
>@@ -34,7 +37,7 @@
>             common/libinit.a \
>             loader/libloader.a \
>             common/libcommon.a \
>-            parser/libparser.a \
>+            parser/libxf86config.a \
>             $(OS_LIBS) \
>             dummylib/libdummy.a \
> 	    dixmods/libdixmods.la \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/os-support/bsd/Makefile.am xorg-server-0.99.4/hw/xfree86/os-support/bsd/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/os-support/bsd/Makefile.am	2005-10-17 00:18:58.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/os-support/bsd/Makefile.am	2005-12-01 22:02:41.000000000 -0800
>@@ -49,7 +49,7 @@
> endif
> 
> # FIXME: NetBSD Aperture defines (configure.ac)
>-AM_CFLAGS = -DUSESTDRES -DUSE_DEV_IO $(XORG_CFLAGS)
>+AM_CFLAGS = -DUSESTDRES -DUSE_DEV_IO $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = $(XORG_INCS)
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/os-support/bus/Makefile.am xorg-server-0.99.4/hw/xfree86/os-support/bus/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/os-support/bus/Makefile.am	2005-10-17 00:18:58.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/os-support/bus/Makefile.am	2005-12-01 22:02:41.000000000 -0800
>@@ -1,44 +1,56 @@
> noinst_LTLIBRARIES = libbus.la
> sdk_HEADERS = xf86Pci.h
> 
>-PCI_SOURCES = @XORG_OS_PCI@Pci.c 
>+PCI_SOURCES =
>+
>+if XORG_BUS_LINUXPCI
>+PCI_SOURCES += linuxPci.c
>+endif
>+
>+if XORG_BUS_FREEBSDPCI
>+PCI_SOURCES += freebsdPci.c
>+endif
>+
>+if XORG_BUS_NETBSDPCI
>+PCI_SOURCES += netbsdPci.c
>+endif
> 
> if XORG_BUS_IX86PCI
> PCI_SOURCES += ix86Pci.c
> endif
> 
>+if XORG_BUS_PPCPCI
>+PCI_SOURCES += ppcPci.c
>+endif
>+
>+if XORG_BUS_SPARCPCI
>+PCI_SOURCES += sparcPci.c
>+endif
>+
>+if LINUX_ALPHA
>+PCI_SOURCES += axpPci.c
>+endif
>+
> if LINUX_IA64
>-PLATFORM_PCI_SOURCES = 460gxPCI.c altixPCI.c e8870PCI.c zx1PCI.c
>+PLATFORM_PCI_SOURCES = \
>+	460gxPCI.c \
>+	460gxPCI.h \
>+	altixPCI.c \
>+	altixPCI.h \
>+	e8870PCI.c \
>+	e8870PCI.h \
>+	zx1PCI.c \
>+	zx1PCI.h
> endif
> 
> if XORG_BUS_SPARC
>-PLATFORM_PCI_SOURCES = sparcPci.c
> PLATFORM_SOURCES = Sbus.c
>+sdk_HEADERS += xf86Sbus.h
> endif
> 
>-libbus_la_SOURCES = Pci.c $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \
>+libbus_la_SOURCES = Pci.c Pci.h $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \
>                     $(PLATFORM_SOURCES)
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>-
>-# hack to keep all the OS PCI support files in the distball even though
>-# there aren't rules to build them all yet.  also the AC_SUBST pattern
>-# above will defeat automake's EXTRA_DIST logic, woo.
>-PCIDISTSOURCES = \
>-	axpPci.c \
>-	freebsdPci.c \
>-	linuxPci.c \
>-	netbsdPci.c \
>-	ppcPci.c \
>-	sparcPci.c
>-
>-EXTRA_DIST = \
>-	460gxPCI.h \
>-	Pci.h \
>-	altixPCI.h \
>-	e8870PCI.h \
>-	zx1PCI.h \
>-	xf86Sbus.h \
>-        $(PCIDISTSOURCES)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/os-support/bus/xf86Sbus.h xorg-server-0.99.4/hw/xfree86/os-support/bus/xf86Sbus.h
>--- xorg-server-0.99.3/hw/xfree86/os-support/bus/xf86Sbus.h	2005-07-03 00:01:31.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/os-support/bus/xf86Sbus.h	1969-12-31 16:00:00.000000000 -0800
>@@ -1,70 +0,0 @@
>-/*
>- * Platform specific SBUS and OpenPROM access declarations.
>- *
>- * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
>- *
>- * Permission is hereby granted, free of charge, to any person obtaining a copy
>- * of this software and associated documentation files (the "Software"), to deal
>- * in the Software without restriction, including without limitation the rights
>- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>- * copies of the Software, and to permit persons to whom the Software is
>- * furnished to do so, subject to the following conditions:
>- *
>- * The above copyright notice and this permission notice shall be included in
>- * all copies or substantial portions of the Software.
>- *
>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
>- * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
>- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>- */
>-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.3 2001/04/20 17:02:43 tsi Exp $ */
>-
>-#ifdef HAVE_XORG_CONFIG_H
>-#include <xorg-config.h>
>-#endif
>-
>-#ifndef _XF86_SBUS_H
>-#define _XF86_SBUS_H
>-
>-#if defined(linux)
>-#include <asm/types.h>
>-#include <linux/fb.h>
>-#include <asm/fbio.h>
>-#include <asm/openpromio.h>
>-#elif defined(SVR4)
>-#include <sys/fbio.h>
>-#include <sys/openpromio.h>
>-#elif defined(__OpenBSD__) && defined(__sparc64__)
>-/* XXX */
>-#elif defined(CSRG_BASED)
>-#if defined(__FreeBSD__)
>-#include <sys/types.h>
>-#include <sys/fbio.h>
>-#include <dev/ofw/openpromio.h>
>-#else
>-#include <machine/fbio.h>
>-#endif
>-#else
>-#include <sun/fbio.h>
>-#endif
>-
>-#ifndef FBTYPE_SUNGP3
>-#define FBTYPE_SUNGP3 -1
>-#endif
>-#ifndef FBTYPE_MDICOLOR
>-#define FBTYPE_MDICOLOR -1
>-#endif
>-#ifndef FBTYPE_SUNLEO
>-#define FBTYPE_SUNLEO -1
>-#endif
>-#ifndef FBTYPE_TCXCOLOR
>-#define FBTYPE_TCXCOLOR -1
>-#endif
>-#ifndef FBTYPE_CREATOR
>-#define FBTYPE_CREATOR -1
>-#endif
>-
>-#endif /* _XF86_SBUS_H */
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/os-support/drm/Makefile.am xorg-server-0.99.4/hw/xfree86/os-support/drm/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/os-support/drm/Makefile.am	2005-08-30 15:31:52.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/os-support/drm/Makefile.am	2005-12-01 22:02:42.000000000 -0800
>@@ -7,7 +7,9 @@
>                    -I$(top_srcdir)/GL/glx \
>                    -I$(top_srcdir)/GL/include \
>                    -DHAVE_XORG_CONFIG_H \
>-                   @LIBDRM_CFLAGS@
>+                   @LIBDRM_CFLAGS@ \
>+                   @SERVER_DEFINES@ \
>+                   @LOADER_DEFINES@
> libdrm_la_LDFLAGS = -module -avoid-version
> libdrm_ladir = $(moduledir)/@XORG_OS@
> libdrm_la_SOURCES = \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/os-support/drm/xf86drm.c xorg-server-0.99.4/hw/xfree86/os-support/drm/xf86drm.c
>--- xorg-server-0.99.3/hw/xfree86/os-support/drm/xf86drm.c	2005-10-03 09:46:14.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/os-support/drm/xf86drm.c	2005-11-30 14:59:21.000000000 -0800
>@@ -31,7 +31,7 @@
>  * DEALINGS IN THE SOFTWARE.
>  */
> 
>-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.35tsi Exp $ */
>+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.36 2003/08/24 17:35:35 tsi Exp $ */
> 
> #ifdef HAVE_XORG_CONFIG_H
> #include <xorg-config.h>
>@@ -66,12 +66,9 @@
> # ifdef DRM_USE_MALLOC
> #  define _DRM_MALLOC malloc
> #  define _DRM_FREE   free
>-extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
>-extern int xf86RemoveSIGIOHandler(int fd);
> # else
>-#  include <X11/Xlibint.h>
>-#  define _DRM_MALLOC Xmalloc
>-#  define _DRM_FREE   Xfree
>+#  define _DRM_MALLOC malloc
>+#  define _DRM_FREE   free
> # endif
> # include "drm.h"
> #endif
>@@ -2268,7 +2265,7 @@
>     return 0;
> }
> 
>-#if defined(XFree86Server) || defined(DRM_USE_MALLOC)
>+#if defined(XFree86Server) 
> static void drmSIGIOHandler(int interrupt, void *closure)
> {
>     unsigned long key;
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/os-support/drm/xf86drmHash.c xorg-server-0.99.4/hw/xfree86/os-support/drm/xf86drmHash.c
>--- xorg-server-0.99.3/hw/xfree86/os-support/drm/xf86drmHash.c	2005-07-03 00:01:32.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/os-support/drm/xf86drmHash.c	2005-11-30 14:59:22.000000000 -0800
>@@ -25,7 +25,7 @@
>  *
>  * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
>  *
>- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c,v 1.3 2000/06/17 00:03:34 martin Exp $
>+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c,v 1.4 2001/03/21 18:08:54 dawes Exp $
>  *
>  * DESCRIPTION
>  *
>@@ -70,16 +70,17 @@
>  *
>  */
> 
>-#define HASH_MAIN 0
>-
> #ifdef HAVE_XORG_CONFIG_H
> #include <xorg-config.h>
> #endif
> 
>+#define HASH_MAIN 0
>+
> #if HASH_MAIN
> # include <stdio.h>
> # include <stdlib.h>
> #else
>+# include "drm.h"
> # include "xf86drm.h"
> # ifdef XFree86LOADER
> #  include "xf86.h"
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/os-support/drm/xf86drmRandom.c xorg-server-0.99.4/hw/xfree86/os-support/drm/xf86drmRandom.c
>--- xorg-server-0.99.3/hw/xfree86/os-support/drm/xf86drmRandom.c	2005-07-03 00:01:32.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/os-support/drm/xf86drmRandom.c	2005-11-30 14:59:21.000000000 -0800
>@@ -25,7 +25,7 @@
>  * 
>  * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
>  *
>- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRandom.c,v 1.3 2000/02/23 04:47:23 martin Exp $
>+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRandom.c,v 1.4 2000/06/17 00:03:34 martin Exp $
>  *
>  * DESCRIPTION
>  *
>@@ -73,16 +73,17 @@
>  *
>  */
> 
>-#define RANDOM_MAIN 0
>-
> #ifdef HAVE_XORG_CONFIG_H
> #include <xorg-config.h>
> #endif
> 
>+#define RANDOM_MAIN 0
>+
> #if RANDOM_MAIN
> # include <stdio.h>
> # include <stdlib.h>
> #else
>+# include "drm.h"
> # include "xf86drm.h"
> # ifdef XFree86LOADER
> #  include "xf86.h"
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/os-support/drm/xf86drmSL.c xorg-server-0.99.4/hw/xfree86/os-support/drm/xf86drmSL.c
>--- xorg-server-0.99.3/hw/xfree86/os-support/drm/xf86drmSL.c	2005-07-03 00:01:33.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/os-support/drm/xf86drmSL.c	2005-11-30 14:59:21.000000000 -0800
>@@ -40,17 +40,18 @@
>  *
>  */
> 
>-#define SL_MAIN 0
>-
> #ifdef HAVE_XORG_CONFIG_H
> #include <xorg-config.h>
> #endif
> 
>+#define SL_MAIN 0
>+
> #if SL_MAIN
> # include <stdio.h>
> # include <stdlib.h>
> #  include <sys/time.h>
> #else
>+# include "drm.h"
> # include "xf86drm.h"
> # ifdef XFree86LOADER
> #  include "xf86.h"
>@@ -349,16 +350,16 @@
> 		   list->magic, SL_ENTRY_MAGIC);
> 	}
> 	printf("\nEntry %p <0x%08lx, %p> has %2d levels\n",
>-	       (void *)entry, entry->key, entry->value, entry->levels);
>+	       entry, entry->key, entry->value, entry->levels);
> 	for (i = 0; i < entry->levels; i++) {
> 	    if (entry->forward[i]) {
> 		printf("   %2d: %p <0x%08lx, %p>\n",
> 		       i,
>-		       (void *)entry->forward[i],
>+		       entry->forward[i],
> 		       entry->forward[i]->key,
> 		       entry->forward[i]->value);
> 	    } else {
>-		printf("   %2d: %p\n", i, (void *)entry->forward[i]);
>+		printf("   %2d: %p\n", i, entry->forward[i]);
> 	    }
> 	}
>     }
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/os-support/linux/Makefile.am xorg-server-0.99.4/hw/xfree86/os-support/linux/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/os-support/linux/Makefile.am	2005-10-17 00:18:58.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/os-support/linux/Makefile.am	2005-12-01 22:02:42.000000000 -0800
>@@ -4,8 +4,8 @@
> PLATFORM_PCI_SUPPORT = $(srcdir)/../shared/ia64Pci.c
> endif
> if LINUX_ALPHA
>-PLATFORM_PCI_SUPPORT = lnx_ev56.c
>-       $(srcdir)/lnx_axp.c
>+PLATFORM_PCI_SUPPORT = lnx_ev56.c \
>+       $(srcdir)/lnx_axp.c \
>        $(srcdir)/../shared/xf86Axp.c
> endif
> 
>@@ -22,7 +22,7 @@
>                      $(srcdir)/../shared/at_scancode.c \
>                      $(PLATFORM_PCI_SUPPORT)
> 
>-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
>+AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/os-support/misc/Makefile.am xorg-server-0.99.4/hw/xfree86/os-support/misc/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/os-support/misc/Makefile.am	2005-10-17 00:18:58.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/os-support/misc/Makefile.am	2005-12-01 22:02:42.000000000 -0800
>@@ -18,6 +18,6 @@
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> EXTRA_DIST = $(I386_SOURCES) $(PORTIO_SOURCES) $(ILHACK_SOURCES)
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/os-support/solaris/Makefile.am xorg-server-0.99.4/hw/xfree86/os-support/solaris/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/os-support/solaris/Makefile.am	2005-10-17 00:18:58.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/os-support/solaris/Makefile.am	2005-12-01 22:02:42.000000000 -0800
>@@ -34,7 +34,7 @@
> sdk_HEADERS = agpgart.h
> nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il
> 
>-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
>+AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = $(XORG_INCS) 
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/os-support/xf86drmCompat.h xorg-server-0.99.4/hw/xfree86/os-support/xf86drmCompat.h
>--- xorg-server-0.99.3/hw/xfree86/os-support/xf86drmCompat.h	2005-08-24 04:18:31.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/os-support/xf86drmCompat.h	2005-06-15 11:31:52.000000000 -0700
>@@ -32,7 +32,7 @@
>  * Backwards compatability modules broken out by:
>  *   Jens Owen <jens@tungstengraphics.com>
>  *
>- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drmRadeon.h,v 1.6 2001/04/16 15:02:13 tsi Exp $
>+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drmCompat.h,v 1.1 2002/10/30 12:52:23 alanh Exp $
>  *
>  */
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/os-support/xf86drm.h xorg-server-0.99.4/hw/xfree86/os-support/xf86drm.h
>--- xorg-server-0.99.3/hw/xfree86/os-support/xf86drm.h	2005-08-24 04:18:31.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/os-support/xf86drm.h	2005-11-30 14:59:22.000000000 -0800
>@@ -148,7 +148,8 @@
> typedef enum {
>     DRM_PAGE_ALIGN       = 0x01,
>     DRM_AGP_BUFFER       = 0x02,
>-    DRM_SG_BUFFER        = 0x04
>+    DRM_SG_BUFFER        = 0x04,
>+    DRM_FB_BUFFER        = 0x08
> } drmBufDescFlags;
> 
> typedef enum {
>@@ -282,11 +283,11 @@
> 
> #define __drm_dummy_lock(lock) (*(__volatile__ unsigned int *)lock)
> 
>-#define DRM_LOCK_HELD  0x80000000 /**< Hardware lock is held */
>-#define DRM_LOCK_CONT  0x40000000 /**< Hardware lock is contended */
>+#define DRM_LOCK_HELD  0x80000000U /**< Hardware lock is held */
>+#define DRM_LOCK_CONT  0x40000000U /**< Hardware lock is contended */
> 
> #if defined(__GNUC__) && (__GNUC__ >= 2)
>-# if defined(__i386) || defined(__amd64__)
>+# if defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__)
> 				/* Reflect changes here to drmP.h */
> #define DRM_CAS(lock,old,new,__ret)                                    \
> 	do {                                                           \
>@@ -318,8 +319,8 @@
>                 "       stl_c %1, %2\n"		\
>                 "1:     xor   %1, 1, %1\n"	\
>                 "       stl   %1, %3"		\
>-                : "+r" (old32),                 \
>-		  "+&r" (cur32),		\
>+                : "=r" (old32),                 \
>+		  "=&r" (cur32),		\
>                    "=m" (__drm_dummy_lock(lock)),\
>                    "=m" (ret)			\
>  		: "r" (old),			\
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/parser/Makefile.am xorg-server-0.99.4/hw/xfree86/parser/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/parser/Makefile.am	2005-10-06 12:37:38.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/parser/Makefile.am	2005-12-01 22:02:42.000000000 -0800
>@@ -1,7 +1,27 @@
>-noinst_LIBRARIES = libparser.a
>-libparser_a_SOURCES = Device.c Files.c Flags.c Input.c Keyboard.c Layout.c \
>-                      Module.c Video.c Monitor.c Pointer.c Screen.c \
>-                      Vendor.c read.c scan.c write.c DRI.c Extensions.c
>+if INSTALL_LIBXF86CONFIG
>+lib_LIBRARIES = libxf86config.a
>+else
>+noinst_LIBRARIES = libxf86config.a
>+endif
>+
>+libxf86config_a_SOURCES = \
>+	Device.c \
>+	Files.c \
>+	Flags.c \
>+	Input.c \
>+	Keyboard.c \
>+	Layout.c \
>+	Module.c \
>+	Video.c \
>+	Monitor.c \
>+	Pointer.c \
>+	Screen.c \
>+	Vendor.c \
>+	read.c \
>+	scan.c \
>+	write.c \
>+	DRI.c \
>+	Extensions.c
> 
> AM_CFLAGS = $(XORG_CFLAGS)
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/rac/Makefile.am xorg-server-0.99.4/hw/xfree86/rac/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/rac/Makefile.am	2005-07-13 15:09:50.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/rac/Makefile.am	2005-12-01 22:02:42.000000000 -0800
>@@ -6,4 +6,4 @@
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/ramdac/Makefile.am xorg-server-0.99.4/hw/xfree86/ramdac/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/ramdac/Makefile.am	2005-10-06 12:37:38.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/ramdac/Makefile.am	2005-12-01 22:02:42.000000000 -0800
>@@ -13,7 +13,7 @@
> 	CURSOR.NOTES
> 
> AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \
>-            $(XORG_CFLAGS)
>+            $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> INCLUDES = $(XORG_INCS)
> 
> xf86BitOrder.c:
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/scanpci/Makefile.am xorg-server-0.99.4/hw/xfree86/scanpci/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/scanpci/Makefile.am	2005-10-06 12:37:39.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/scanpci/Makefile.am	2005-12-01 22:02:42.000000000 -0800
>@@ -8,7 +8,7 @@
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> BUILT_SOURCES = xf86PciIds.h
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/shadowfb/Makefile.am xorg-server-0.99.4/hw/xfree86/shadowfb/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/shadowfb/Makefile.am	2005-07-13 15:09:51.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/shadowfb/Makefile.am	2005-12-01 22:02:42.000000000 -0800
>@@ -6,4 +6,4 @@
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/utils/gtf/Makefile.am xorg-server-0.99.4/hw/xfree86/utils/gtf/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/utils/gtf/Makefile.am	2005-10-03 17:43:16.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/utils/gtf/Makefile.am	2005-11-28 14:05:08.000000000 -0800
>@@ -32,11 +32,19 @@
> gtf_CFLAGS = $(XORG_CFLAGS)
> gtf_LDADD = -lm
> 
>+appmandir = $(APP_MAN_DIR)
> 
>-man1_MANS = gtf.man
>-
>-CLEANFILES = $(man1_MANS)
>+appman_SOURCES = gtf.man
>+appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
> 
> include $(top_srcdir)/cpprules.in
> 
> EXTRA_DIST = gtf.man.pre
>+BUILT_SOURCES = $(appman_SOURCES)
>+CLEANFILES = $(appman_SOURCES) $(appman_DATA)
>+
>+SUFFIXES += .$(APP_MAN_SUFFIX) .man
>+
>+.man.$(APP_MAN_SUFFIX):
>+	-rm -f $@
>+	$(LN_S) $< $@
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/utils/ioport/Makefile.am xorg-server-0.99.4/hw/xfree86/utils/ioport/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/utils/ioport/Makefile.am	2005-09-26 13:58:26.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/utils/ioport/Makefile.am	2005-11-21 18:11:00.000000000 -0800
>@@ -45,12 +45,12 @@
> 
> all-local:
> 	@for i in $(ioport_PROGRAM_LINKS); do (set -x; \
>-	        $(RM) $$i; $(LN_S) ioport $$i); \
>+		rm -f $$i; $(LN_S) ioport $$i); \
>         done
> 
> install-exec-hook:
> 	@for i in $(ioport_PROGRAM_LINKS); do (set -x; \
>-	        $(RM) $(DESTDIR)$(bindir)/$$i; \
>+		rm -f $(DESTDIR)$(bindir)/$$i; \
> 	        (cd $(DESTDIR)$(bindir); $(LN_S) ioport $$i)); \
>         done
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/utils/kbd_mode/Makefile.am xorg-server-0.99.4/hw/xfree86/utils/kbd_mode/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/utils/kbd_mode/Makefile.am	2005-09-29 19:37:56.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/utils/kbd_mode/Makefile.am	2005-11-28 14:05:09.000000000 -0800
>@@ -1,4 +1,4 @@
>-# $Id: Makefile.am,v 1.2 2005/09/30 02:37:56 alanc Exp $
>+# $Id: Makefile.am,v 1.4 2005/11/28 22:05:09 alanc Exp $
> #
> # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
> # 
>@@ -43,9 +43,14 @@
> MAN_SRC = sun-kbd_mode.man.pre
> endif
> 
>-man1_MANS = kbd_mode.man
>+appmandir = $(APP_MAN_DIR)
> 
>-all-local: kbd_mode.man.pre $(man1_MANS)
>+appman_SOURCES = kbd_mode.man
>+appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
>+BUILT_SOURCES = $(appman_SOURCES)
>+CLEANFILES = $(appman_SOURCES) $(appman_DATA)
>+
>+all-local: kbd_mode.man.pre $(appman_DATA)
> 
> kbd_mode.man.pre: $(MAN_SRC)
> 	$(LN_S) $(MAN_SRC) kbd_mode.man.pre
>@@ -54,4 +59,10 @@
> 
> include $(top_srcdir)/cpprules.in
> 
>+SUFFIXES += .$(APP_MAN_SUFFIX) .man
>+
>+.man.$(APP_MAN_SUFFIX):
>+	-rm -f $@
>+	$(LN_S) $< $@
>+
> EXTRA_DIST = bsd-kbd_mode.man.pre sun-kbd_mode.man.pre
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/utils/pcitweak/Makefile.am xorg-server-0.99.4/hw/xfree86/utils/pcitweak/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/utils/pcitweak/Makefile.am	2005-09-29 19:37:56.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/utils/pcitweak/Makefile.am	2005-11-28 14:05:09.000000000 -0800
>@@ -41,10 +41,19 @@
> pcitweak_SOURCES =	\
> 	pcitweak.c
> 
>-man1_MANS = pcitweak.man
>+appmandir = $(APP_MAN_DIR)
> 
>-CLEANFILES = $(man1_MANS)
>+appman_SOURCES = pcitweak.man
>+appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
> 
> include $(top_srcdir)/cpprules.in
> 
> EXTRA_DIST = pcitweak.man.pre
>+BUILT_SOURCES = $(appman_SOURCES)
>+CLEANFILES = $(appman_SOURCES) $(appman_DATA)
>+
>+SUFFIXES += .$(APP_MAN_SUFFIX) .man
>+
>+.man.$(APP_MAN_SUFFIX):
>+	-rm -f $@
>+	$(LN_S) $< $@
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/utils/scanpci/Makefile.am xorg-server-0.99.4/hw/xfree86/utils/scanpci/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/utils/scanpci/Makefile.am	2005-09-29 19:37:57.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/utils/scanpci/Makefile.am	2005-11-28 14:05:09.000000000 -0800
>@@ -43,10 +43,19 @@
> scanpci_SOURCES =	\
> 	scanpci.c
> 
>-man1_MANS = scanpci.man
>+appmandir = $(APP_MAN_DIR)
> 
>-CLEANFILES = $(man1_MANS)
>+appman_SOURCES = scanpci.man
>+appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
> 
> include $(top_srcdir)/cpprules.in
> 
>-EXTRA_DIST = scanpci.man.pre
>\ No newline at end of file
>+EXTRA_DIST = scanpci.man.pre
>+BUILT_SOURCES = $(appman_SOURCES)
>+CLEANFILES = $(appman_SOURCES) $(appman_DATA)
>+
>+SUFFIXES += .$(APP_MAN_SUFFIX) .man
>+
>+.man.$(APP_MAN_SUFFIX):
>+	-rm -f $@
>+	$(LN_S) $< $@
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/utils/xorgcfg/Makefile.am xorg-server-0.99.4/hw/xfree86/utils/xorgcfg/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/utils/xorgcfg/Makefile.am	2005-11-03 09:08:06.000000000 -0800
>+++ xorg-server-0.99.4/hw/xfree86/utils/xorgcfg/Makefile.am	2005-12-01 22:02:42.000000000 -0800
>@@ -31,8 +31,9 @@
> 
> INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser
> 
>-xorgcfg_CFLAGS = $(XORG_CFLAGS) $(CURSESDEFINES) $(XORGCFG_DEP_CFLAGS)
>-xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libparser.a $(LOADERLIB) \
>+xorgcfg_CFLAGS = @SERVER_DEFINES@ $(XORG_CFLAGS) $(CURSESDEFINES) \
>+	$(XORGCFG_DEP_CFLAGS)
>+xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libxf86config.a $(LOADERLIB) \
> 	../../os-support/libxorgos.la ../../dummylib/libdummy-nonserver.a
> 
> #if DoLoadableServer
>@@ -48,6 +49,10 @@
> CURSESDEFINES  = -DHAS_NCURSES
> endif
> 
>+if NEED_STRLCAT
>+STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c
>+endif
>+
> xorgcfg_SOURCES =	\
>         accessx.c \
>         card-cfg.c \
>@@ -83,7 +88,8 @@
>         screen.h \
>         stubs.h \
>         vidmode.h \
>-        xf86config.h
>+        xf86config.h \
>+	$(STRL_SRCS)
> 
> XBMdir = $(includedir)/X11/bitmaps
> XPMdir = $(includedir)/X11/pixmaps
>@@ -129,12 +135,21 @@
> 	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < XOrgCfg.pre | $(CPP_SED_MAGIC) > $@
> 
> # Man page
>-man1_MANS =  xorgcfg.man
>+appmandir = $(APP_MAN_DIR)
> 
>-all-local: $(man1_MANS)
>+appman_SOURCES = xorgcfg.man
>+appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
>+
>+all-local: $(appman_SOURCES) $(appman_DATA)
> 
> EXTRA_DIST = $(XBM_DATA) $(XPM_DATA) XOrgCfg.pre xorgcfg.man.pre
>+BUILT_SOURCES = $(appman_SOURCES)
>+CLEANFILES = $(APPDEFAULTFILES) $(BUILT_SOURCES) $(appman_DATA)
>+
>+SUFFIXES += .$(APP_MAN_SUFFIX) .man
> 
>-CLEANFILES = $(APPDEFAULTFILES) $(man1_MANS)
>+.man.$(APP_MAN_SUFFIX):
>+	-rm -f $@
>+	$(LN_S) $< $@
> 
> endif
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/utils/xorgconfig/Makefile.am xorg-server-0.99.4/hw/xfree86/utils/xorgconfig/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/utils/xorgconfig/Makefile.am	2005-10-13 17:34:49.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/utils/xorgconfig/Makefile.am	2005-12-01 22:02:42.000000000 -0800
>@@ -31,13 +31,13 @@
> X11dir = $(libdir)/X11
> dist_X11_DATA = Cards
> 
>-xorgconfig_CFLAGS = $(DEP_CFLAGS) \
>+xorgconfig_CFLAGS = @SERVER_DEFINES@ @XORGCONFIG_DEP_CFLAGS@ \
> 	-DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \
> 	-DPROJECTROOT='"$(prefix)"' \
>         -DFILEMANSUFFIX='"$(FILE_MAN_SUFFIX)"' \
>         -DXVERSIONSTRING='"$(PACKAGE_STRING)"'
> 
>-xorgconfig_LDADD = $(XORGCONFIG_DEP_LIBS)
>+xorgconfig_LDADD = @XORGCONFIG_DEP_LIBS@
> 
> xorgconfig_SOURCES =	\
> 	cards.c		\
>@@ -47,13 +47,23 @@
> # Man page
> include $(top_srcdir)/cpprules.in
> 
>-man1_MANS = xorgconfig.man
>+appmandir = $(APP_MAN_DIR)
>+
>+appman_SOURCES = xorgconfig.man
>+appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
> 
> EXTRAMANDEFS = \
> 	-D__XCONFIGFILE__=$(__XCONFIGFILE__) \
> 	-D__XSERVERNAME__=$(XSERVERNAME)
> 
>-CLEANFILES = $(man1_MANS)
>+BUILT_SOURCES = $(appman_SOURCES)
>+CLEANFILES = $(appman_SOURCES) $(appman_DATA)
>+
>+SUFFIXES += .$(APP_MAN_SUFFIX) .man
>+
>+.man.$(APP_MAN_SUFFIX):
>+	-rm -f $@
>+	$(LN_S) $< $@
> 
> EXTRA_DIST = \
> 	Cards98 \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/vbe/Makefile.am xorg-server-0.99.4/hw/xfree86/vbe/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/vbe/Makefile.am	2005-07-13 15:09:51.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/vbe/Makefile.am	2005-12-01 22:02:43.000000000 -0800
>@@ -4,7 +4,7 @@
> 
> sdk_HEADERS = vbe.h vbeModes.h
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
>            -I$(srcdir)/../int10
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/vgahw/Makefile.am xorg-server-0.99.4/hw/xfree86/vgahw/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/vgahw/Makefile.am	2005-10-17 00:18:58.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/vgahw/Makefile.am	2005-12-01 22:02:43.000000000 -0800
>@@ -2,7 +2,7 @@
> libvgahw_la_LDFLAGS = -avoid-version
> libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c
> INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> sdk_HEADERS = vgaHW.h
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/xaa/Makefile.am xorg-server-0.99.4/hw/xfree86/xaa/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/xaa/Makefile.am	2005-10-13 11:08:24.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/xaa/Makefile.am	2005-12-01 22:02:43.000000000 -0800
>@@ -65,4 +65,4 @@
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/xf1bpp/Makefile.am xorg-server-0.99.4/hw/xfree86/xf1bpp/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/xf1bpp/Makefile.am	2005-10-13 11:08:24.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/xf1bpp/Makefile.am	2005-12-01 22:02:43.000000000 -0800
>@@ -60,7 +60,8 @@
> 
> libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES)
> 
>-AM_CFLAGS = -DXF86MONO -include mfbmap.h $(XORG_CFLAGS)
>+AM_CFLAGS = -DXF86MONO -include mfbmap.h $(DIX_CFLAGS) $(XORG_CFLAGS) \
>+	@SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb
> 
> mfbseg.c:
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/xf4bpp/Makefile.am xorg-server-0.99.4/hw/xfree86/xf4bpp/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/xf4bpp/Makefile.am	2005-10-13 11:08:24.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/xf4bpp/Makefile.am	2005-12-01 22:02:43.000000000 -0800
>@@ -59,4 +59,4 @@
> 
> INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/xf8_16bpp/Makefile.am xorg-server-0.99.4/hw/xfree86/xf8_16bpp/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/xf8_16bpp/Makefile.am	2005-07-13 15:09:52.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/xf8_16bpp/Makefile.am	2005-12-01 22:02:43.000000000 -0800
>@@ -4,7 +4,7 @@
> 
> INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> libxf8_16bpp_la_LDFLAGS = -avoid-version
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/xf8_32bpp/Makefile.am xorg-server-0.99.4/hw/xfree86/xf8_32bpp/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/xf8_32bpp/Makefile.am	2005-09-14 21:07:19.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/xf8_32bpp/Makefile.am	2005-12-01 22:02:43.000000000 -0800
>@@ -4,7 +4,7 @@
> 
> INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
> 
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> libxf8_32bpp_la_LDFLAGS = -avoid-version
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xfree86/xf8_32wid/Makefile.am xorg-server-0.99.4/hw/xfree86/xf8_32wid/Makefile.am
>--- xorg-server-0.99.3/hw/xfree86/xf8_32wid/Makefile.am	2005-07-26 16:40:45.000000000 -0700
>+++ xorg-server-0.99.4/hw/xfree86/xf8_32wid/Makefile.am	2005-12-01 22:02:43.000000000 -0800
>@@ -5,7 +5,7 @@
> libxf8_32wid_la_LDFLAGS = -avoid-version
> 
> INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
>-AM_CFLAGS = $(XORG_CFLAGS)
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> libxf8_32wid_la_SOURCES = \
> 	cfb8_32widmodule.c \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xnest/Makefile.am xorg-server-0.99.4/hw/xnest/Makefile.am
>--- xorg-server-0.99.3/hw/xnest/Makefile.am	2005-09-29 19:37:57.000000000 -0700
>+++ xorg-server-0.99.4/hw/xnest/Makefile.am	2005-12-01 22:02:43.000000000 -0800
>@@ -53,7 +53,7 @@
> 
> AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
>             -DNO_HW_ONLY_EXTS \
>-            -DXFree86Server \
>+            @SERVER_DEFINES@ \
>             $(XNESTMODULES_CFLAGS)
> 
> EXTRA_DIST = os2Stub.c \
>@@ -66,8 +66,23 @@
> # EXT_DEFINES???
> # ICONFIGFILES -- SpecialCObjectRule
> 
>-man1_MANS = Xnest.man
>+# Man page
>+include $(top_srcdir)/cpprules.in
> 
>-CLEANFILES = $(man1_MANS)
>+appmandir = $(APP_MAN_DIR)
> 
>-include $(top_srcdir)/cpprules.in
>+appman_SOURCES = Xnest.man
>+appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
>+
>+EXTRAMANDEFS = \
>+	-D__XCONFIGFILE__=$(__XCONFIGFILE__) \
>+	-D__XSERVERNAME__=$(XSERVERNAME)
>+
>+BUILT_SOURCES = $(appman_SOURCES)
>+CLEANFILES = $(appman_SOURCES) $(appman_DATA)
>+
>+SUFFIXES += .$(APP_MAN_SUFFIX) .man
>+
>+.man.$(APP_MAN_SUFFIX):
>+	-rm -f $@
>+	$(LN_S) $< $@
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xwin/Makefile.am xorg-server-0.99.4/hw/xwin/Makefile.am
>--- xorg-server-0.99.3/hw/xwin/Makefile.am	2005-10-07 07:27:47.000000000 -0700
>+++ xorg-server-0.99.4/hw/xwin/Makefile.am	2005-11-13 12:53:24.000000000 -0800
>@@ -164,7 +164,7 @@
> AM_CFLAGS = -DHAVE_XWIN_CONFIG_H \
>             $(XWINMODULES_CFLAGS)
> 
>-dist_man_MANS = XWin.1 XWinrc.1
>+dist_man1_MANS = XWin.man XWinrc.man
> 
> EXTRA_DIST = \
> 	_usr_X11R6_lib_X11_system.XWinrc \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xwin/XWin.1 xorg-server-0.99.4/hw/xwin/XWin.1
>--- xorg-server-0.99.3/hw/xwin/XWin.1	2005-01-11 09:33:03.000000000 -0800
>+++ xorg-server-0.99.4/hw/xwin/XWin.1	1969-12-31 16:00:00.000000000 -0800
>@@ -1,287 +0,0 @@
>-.TH XWIN 1 __vendorversion__
>-.SH NAME
>-XWin \- X Server for the Cygwin environment on Microsoft Windows
>-
>-
>-.SH SYNOPSIS
>-.B XWin
>-[ options ] ...
>-
>-
>-.SH DESCRIPTION
>-.I XWin is an X Server for the X Window System on the Cygwin environment
>-running on Microsoft Windows.
>-
>-
>-.SH MODES
>-\fIXWin\fP can operate in five different and incompatible modes:
>-.br
>-* \fISingle Window\fP: This is the default option.  The X server
>-appears as a single Windows window and all X windows are contained
>-within this window.  This mode requires an external window manager.
>-.br
>-* \fINo Decoration\fP: This mode is like single window mode except
>-that the X server window does not have a title bar or border, thus
>-maximizing the amount of space available for X windows within the X
>-server window.  This mode requires an external window manager.
>-.br
>-* \fIFull Screen\fP: This mode is like single window mode except that
>-the X server window takes the full screen, covering completely the
>-Windows desktop.  This mode requires an external window manager.
>-.br
>-* \fIRootless\fP: The X server works on a window covering the whole
>-screen but the root window (traditionally covered with an X hatch
>-pattern) is hidden from view.  This mode requires an external window
>-manager.
>-.br
>-* \fIMulti-Window\fP: In this mode \fIXWin\fP uses its own integrated
>-window manager in order to handle the top-level X windows, in such a
>-way that they appear as normal Windows windows.
>-.PP
>-NOTE: \fIMulti-Window\fP mode will crash if an external window manager
>-such as \fItwm\fP or \fIfvwm\fP is launched since \fIMulti-Window\fP
>-uses its own internal window manager; all other modes require an
>-external window manager in order to move, resize, and perform other
>-operations on the individual X windows.
>-
>-
>-.SH LOG
>-As it runs \fIXWin\fP writes messages indicating the most relevant events
>-to  the console
>-from which it was called and to a log file that by default is located at
>-\fI/tmp/XWin.log\fP.  This file is mainly for debugging purposes.
>-
>-
>-.SH PREFERENCES FILE
>-On startup \fIXWin\fP looks for the file \fI$HOME/.XWinrc\fP or, if
>-the previous file does not exist,
>-\fI/usr/X11R6/lib/X11/system.XWinrc\fP.  \fI.XWinrc\fP allows setting
>-preferences for the following:
>-.br
>-1- To include items into the menu associated with the \fIXWin\fP icon
>-which is in the \fIWindows\fP system tray.  This functions in all
>-modes that have a tray icon.
>-.br
>-2- To include items in the menu which is associated with the Windows
>-window that \fIXWin -multiwindow\fP produces for each top-level X
>-window.  That can be done both for the generic case and for particular
>-programs.
>-.br
>-3- To change the icon that is associated to the Windows window that
>-\fIXWin -multiwindow\fP produces for each top-level X-window.  Again,
>-that can be done both for the generic case and for particular
>-programs.
>-.PP
>-The format of the \fI.XWinrc\fP file is given in the man page XWinrc(5).
>-
>-
>-.SH OPTIONS
>-In addition to the normal server options described in the \fIXserver(1)\fP
>-manual page, \fIXWin\fP accepts the following command line switches,
>-\fIall\fP of which are optional:
>-.TP 8
>-.B \-clipboard
>-Enables the integration
>-between the Cygwin/X clipboard and Windows clipboard.  Do not use in
>-conjunction with the \fIxwinclip\fP program.
>-.TP 8
>-.B "\-clipupdates \fInum_boxes\fP"
>-Specify an optional threshold, above which the boxes in a shadow
>-update operation will be collected into a GDI clipping region.  The
>-clipping region is then used to do a single bit block transfer that is
>-constrained to the updated area by the clipping region.  There is some
>-overhead involved in creating, installing, destroying, and removing
>-the clipping region, thus there may not be much benefit for a small
>-number of boxes (less than 10).  It is even possible that this
>-functionality does not provide a benefit at any number of boxes; we
>-can only determine the usefulness of this feature through testing.
>-This parameter works in conjunction with engines 1, 2, and 4 (Shadow
>-GDI, Shadow DirectDraw, and Shadow DirectDraw Non-Locking,
>-respectively).
>-.TP 8
>-.B "\-emulate3buttons \fItimeout\fP"
>-Emulate a three button mouse; pressing both buttons within
>-.I timeout
>-milliseconds causes an emulated middle button press.  The default 
>-.I timeout
>-is 50 milliseconds.  Note that most mice with scroll wheel have middle
>-button functionality, usually you will need this option only if you have
>-a two button mouse without scroll wheel.
>-.TP 8
>-.B \-emulatepseudo
>-Create a depth 8 PseudoColor visual when running in depths 15, 16, 24,
>-or 32, collectively known as TrueColor depths.
>- At this date (April 2004) this option is not still operative.
>-.TP 8
>-.B "\-engine \fIengine_type_id\fP"
>-This option, which is intended for Cygwin/X developers,
>-overrides the server's automatically supported engine type.  This
>-parameter will be ignored if the specified engine type is not
>-supported on the current system.  The supported engine type ids are 1
>-- Shadow GDI, 2 - Shadow DirectDraw, and 4 - Shadow DirectDraw4.
>-Additionally, there is a barely functional experimental engine type id
>-16 - Native GDI.
>-.TP 8
>-.B "\-fullscreen [-depth \fIdepth\fP] [-refresh \fIrate_in_Hz\fP]"
>-Run the server in fullscreen mode, as opposed to the default windowed
>-mode.
>-.TP 8
>-.B "\-depth \fIdepth\fP"
>-Specify the color depth, in bits per pixel, to use when running in
>-fullscreen with a DirectDraw engine.  This parameter is ignored if
>-\fB\-fullscreen\fP is not specified.
>-.TP 8
>-.B "\-refresh \fIrate_in_Hz\fP"
>-Specify an optional refresh rate to use when running in
>-fullscreen with a DirectDraw engine.  This parameter is ignored if
>-\fB\-fullscreen\fP is not specified.
>-.TP 8
>-.B \-help
>-Write a help text to the console and to the log file.
>-.TP 8
>-.B \-ignoreinput
>-Ignore keyboard and mouse input.  This is usually only used for testing
>-and debugging purposes.
>-.TP 8
>-.B \-[no]keyhook
>-Enable [disable] a low-level keyboard hook for catching
>-special key combinations like Alt+Tab and passing them to the X
>-Server instead of letting \fIWindows\fP handle them.
>-.TP 8
>-.B \-lesspointer
>-Hide the Windows mouse cursor when the mouse is over any Cygwin/X
>-window (regardless of whether that window is active or inactive).  This
>-prevents the Windows mouse cursor from being placed overtop of the X
>-cursor.
>-.TP 8
>-.B "\-logfile \fIFile_Name\fP"
>-Change the log file from the default located at \fI/tmp/XWin.log\fP to
>-the one indicated by \fIFile_Name\fP.
>-.TP 8
>-.B "\-logverbose \fIlevel\fP"
>-Control the degree of verbosity of the log messages with the integer
>-parameter \fIlevel\fP.  For \fIlevel\fP=0 only fatal errors are
>-reported, for \fIlevel\fP=1 (default) simple information about
>-configuration is also given, for \fIlevel\fP=2 a detailed log
>-information (including trace and debug output) is produced.  Bigger
>-values will yield a still more detailed debug output.  At this date
>-(April 2004) the option is still not fully operative; the default
>-value is 2 and the output is insensitive to the level value.
>-.TP 8
>-.B \-multimonitors
>-Create a root window that covers all monitors on a system with
>-multiple monitors.
>-.TP 8
>-.B \-multiwindow
>-Start the integrated \fIWindowsi\fP-based window manager, which launches each
>-top-level X window in its own \fIWindows\fP window.  Not to be used together
>-with \fB\-rootless\fP nor \fB\-fullscreen\fP.
>-.TP 8
>-.B \-nodecoration
>-Do not give the Cygwin/X window a Windows window border, title bar,
>-etc.  This parameter only applies to windowed mode screens, i.e., this
>-parameter is ignored when the \fB\-fullscreen\fP parameter is specified.
>-.TP 8
>-.B \-nounicodeclipboard
>-Do not use Unicode clipboard even if NT-based platform.
>-.TP 8
>-.B \-rootless
>-Run the server in rootless mode.  Not to be used with \fB\-multiwindow\fP
>-nor with \fB\-fullscreen\fP.
>-.TP 8
>-.B "\-screen \fIscreen_number\fP \fIwidth\fP \fIheight\fP"
>-This parameter may be used to specify the
>-.I screen_number,
>-.I height,
>-and
>-.I width
>-of one or several Cygwin/X screens; each Cygwin/X screen will be
>-opened in its own window.  When using multiple screens, be sure not to
>-duplicate any screen numbers.
>-.I XWin
>-default behavior is to create a single screen that is roughly
>-the size of the current Windows display area.
>-Screen specific parameters, such as \fB\-fullscreen\fP, can be applied as a
>-default to all screens by placing those screen specific parameters
>-before any \fB\-screen\fP parameter.  Screen specific parameters placed after
>-the first \fB\-screen\fP parameter will apply only to the immediately
>-preceeding \fB\-screen\fP parameter.
>-.TP 8
>-.B \-scrollbars
>-In windowed mode, allow screens bigger than the Windows desktop.
>-Moreover, if the window has decorations, one can now resize it.
>-.TP 8
>-.B \-[no]trayicon
>-Do not create a tray icon.  Default is to create one
>-icon per screen.  You can globally disable tray icons with
>-\fB\-notrayicon\fP, then enable it for specific screens with
>-\fB\-trayicon\fP for those screens.
>-.TP 8
>-.B \-[no]unixkill
>-Enable or disable the \fICtrl-Alt-Backspace\fP key combination as a
>-signal to exit the X Server.  The \fICtrl-Alt-Backspace\fP key combination
>-is disabled by default.
>-.TP 8
>-.B \-[no]winkill
>-Enable or disable the \fIAlt-F4\fP key combination as a signal to exit the
>-X Server.
>-The \fIAlt-F4\fP key combination is enabled by default.
>-.TP 8
>-.B \-swcursor
>-Disable the usage of the windows cursor and use the X11 software cursor instead.
>-.B \-silent-dup-error
>-If another instance of XWin is found running, exit silently and don't display 
>-the error messge.
>-.TP 8
>-.B "\-xkblayout \fIlayout\fP"
>-.TP 8
>-.B "\-xkbmodel \fImodel\fP"
>-.TP 8
>-.B "\-xkboptions \fIoption\fP"
>-.TP 8
>-.B "\-xkbrules \fIrule\fP"
>-.TP 8
>-.B "\-xkbvariant \fIvariant\fp"
>-These options implement the xkeyboard extension for loading
>-a particular keyboard map as the X server starts.  The behavior is similar
>-to the \fIsetxkbmap\fP program.  The layout data is located at
>-\fI/usr/X11R6/lib/X11/xkb/\fP.  Additional information is found in the
>-README files therein and in the man page of \fIsetxkbmap\fP.  For example
>-in order to load a German layout for a pc105 keyboard one uses
>-the options:
>-.br
>-.I " \-xkblayout de \-xkbmodel pc105"
>-.PP
>-Alternatively one may use the \fIsetxkbmap\fP program after XWin is
>-running or even the \fIxmodmap\fP program for loading the old-style
>-keyboard maps.
>-
>-
>-.SH "SEE ALSO"
>-X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), XWinrc(1), setxkbmap(1)
>-
>-
>-.SH BUGS
>-.I XWin
>-and this man page still have many limitations.  Some of the more obvious
>-ones are:
>-.br
>-- The display mode can not be changed once the X server has started.
>-.br
>-- The XWin software is developing rapidly; it is therefore likely that
>-this man page is not up to date.  It is always prudent to 
>-look also at the output of \fIXWin -help\fP and to the Cygwin/X User Guide
>-at /usr/share/doc/cygwin-x-doc-x.x.x/ug/cygwin-x-ug.xxx in order to
>-check the options that are operative.
>-
>-
>-.SH AUTHORS
>-This list is by no means complete, but direct contributors to the
>-Cygwin/X project include (in alphabetical order by last name): Stuart
>-Adamson, Michael Bax, Jehan Bing, Lev Bishop, Dr. Peter Busch, Biju G
>-C, Robert Collins, Nick Crabtree, Early Ehlinger, Christopher Faylor,
>-John Fortin, Brian Genisio, Fabrizio Gennari, Alexander Gottwald, Ralf
>-Habacker, Colin Harrison, Matthieu Herrb, Alan Hourihane, Pierre A
>-Humblet, Harold L Hunt II, Dakshinamurthy Karra, Kensuke Matsuzaki,
>-Takuma Murakami, Earle F. Philhower III, Benjamin Riefenstahl, Suhaib
>-Siddiqi, Jack Tanner, and Nicholas Wourms.
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xwin/XWin.man xorg-server-0.99.4/hw/xwin/XWin.man
>--- xorg-server-0.99.3/hw/xwin/XWin.man	1969-12-31 16:00:00.000000000 -0800
>+++ xorg-server-0.99.4/hw/xwin/XWin.man	2005-01-11 09:33:03.000000000 -0800
>@@ -0,0 +1,287 @@
>+.TH XWIN 1 __vendorversion__
>+.SH NAME
>+XWin \- X Server for the Cygwin environment on Microsoft Windows
>+
>+
>+.SH SYNOPSIS
>+.B XWin
>+[ options ] ...
>+
>+
>+.SH DESCRIPTION
>+.I XWin is an X Server for the X Window System on the Cygwin environment
>+running on Microsoft Windows.
>+
>+
>+.SH MODES
>+\fIXWin\fP can operate in five different and incompatible modes:
>+.br
>+* \fISingle Window\fP: This is the default option.  The X server
>+appears as a single Windows window and all X windows are contained
>+within this window.  This mode requires an external window manager.
>+.br
>+* \fINo Decoration\fP: This mode is like single window mode except
>+that the X server window does not have a title bar or border, thus
>+maximizing the amount of space available for X windows within the X
>+server window.  This mode requires an external window manager.
>+.br
>+* \fIFull Screen\fP: This mode is like single window mode except that
>+the X server window takes the full screen, covering completely the
>+Windows desktop.  This mode requires an external window manager.
>+.br
>+* \fIRootless\fP: The X server works on a window covering the whole
>+screen but the root window (traditionally covered with an X hatch
>+pattern) is hidden from view.  This mode requires an external window
>+manager.
>+.br
>+* \fIMulti-Window\fP: In this mode \fIXWin\fP uses its own integrated
>+window manager in order to handle the top-level X windows, in such a
>+way that they appear as normal Windows windows.
>+.PP
>+NOTE: \fIMulti-Window\fP mode will crash if an external window manager
>+such as \fItwm\fP or \fIfvwm\fP is launched since \fIMulti-Window\fP
>+uses its own internal window manager; all other modes require an
>+external window manager in order to move, resize, and perform other
>+operations on the individual X windows.
>+
>+
>+.SH LOG
>+As it runs \fIXWin\fP writes messages indicating the most relevant events
>+to  the console
>+from which it was called and to a log file that by default is located at
>+\fI/tmp/XWin.log\fP.  This file is mainly for debugging purposes.
>+
>+
>+.SH PREFERENCES FILE
>+On startup \fIXWin\fP looks for the file \fI$HOME/.XWinrc\fP or, if
>+the previous file does not exist,
>+\fI/usr/X11R6/lib/X11/system.XWinrc\fP.  \fI.XWinrc\fP allows setting
>+preferences for the following:
>+.br
>+1- To include items into the menu associated with the \fIXWin\fP icon
>+which is in the \fIWindows\fP system tray.  This functions in all
>+modes that have a tray icon.
>+.br
>+2- To include items in the menu which is associated with the Windows
>+window that \fIXWin -multiwindow\fP produces for each top-level X
>+window.  That can be done both for the generic case and for particular
>+programs.
>+.br
>+3- To change the icon that is associated to the Windows window that
>+\fIXWin -multiwindow\fP produces for each top-level X-window.  Again,
>+that can be done both for the generic case and for particular
>+programs.
>+.PP
>+The format of the \fI.XWinrc\fP file is given in the man page XWinrc(5).
>+
>+
>+.SH OPTIONS
>+In addition to the normal server options described in the \fIXserver(1)\fP
>+manual page, \fIXWin\fP accepts the following command line switches,
>+\fIall\fP of which are optional:
>+.TP 8
>+.B \-clipboard
>+Enables the integration
>+between the Cygwin/X clipboard and Windows clipboard.  Do not use in
>+conjunction with the \fIxwinclip\fP program.
>+.TP 8
>+.B "\-clipupdates \fInum_boxes\fP"
>+Specify an optional threshold, above which the boxes in a shadow
>+update operation will be collected into a GDI clipping region.  The
>+clipping region is then used to do a single bit block transfer that is
>+constrained to the updated area by the clipping region.  There is some
>+overhead involved in creating, installing, destroying, and removing
>+the clipping region, thus there may not be much benefit for a small
>+number of boxes (less than 10).  It is even possible that this
>+functionality does not provide a benefit at any number of boxes; we
>+can only determine the usefulness of this feature through testing.
>+This parameter works in conjunction with engines 1, 2, and 4 (Shadow
>+GDI, Shadow DirectDraw, and Shadow DirectDraw Non-Locking,
>+respectively).
>+.TP 8
>+.B "\-emulate3buttons \fItimeout\fP"
>+Emulate a three button mouse; pressing both buttons within
>+.I timeout
>+milliseconds causes an emulated middle button press.  The default 
>+.I timeout
>+is 50 milliseconds.  Note that most mice with scroll wheel have middle
>+button functionality, usually you will need this option only if you have
>+a two button mouse without scroll wheel.
>+.TP 8
>+.B \-emulatepseudo
>+Create a depth 8 PseudoColor visual when running in depths 15, 16, 24,
>+or 32, collectively known as TrueColor depths.
>+ At this date (April 2004) this option is not still operative.
>+.TP 8
>+.B "\-engine \fIengine_type_id\fP"
>+This option, which is intended for Cygwin/X developers,
>+overrides the server's automatically supported engine type.  This
>+parameter will be ignored if the specified engine type is not
>+supported on the current system.  The supported engine type ids are 1
>+- Shadow GDI, 2 - Shadow DirectDraw, and 4 - Shadow DirectDraw4.
>+Additionally, there is a barely functional experimental engine type id
>+16 - Native GDI.
>+.TP 8
>+.B "\-fullscreen [-depth \fIdepth\fP] [-refresh \fIrate_in_Hz\fP]"
>+Run the server in fullscreen mode, as opposed to the default windowed
>+mode.
>+.TP 8
>+.B "\-depth \fIdepth\fP"
>+Specify the color depth, in bits per pixel, to use when running in
>+fullscreen with a DirectDraw engine.  This parameter is ignored if
>+\fB\-fullscreen\fP is not specified.
>+.TP 8
>+.B "\-refresh \fIrate_in_Hz\fP"
>+Specify an optional refresh rate to use when running in
>+fullscreen with a DirectDraw engine.  This parameter is ignored if
>+\fB\-fullscreen\fP is not specified.
>+.TP 8
>+.B \-help
>+Write a help text to the console and to the log file.
>+.TP 8
>+.B \-ignoreinput
>+Ignore keyboard and mouse input.  This is usually only used for testing
>+and debugging purposes.
>+.TP 8
>+.B \-[no]keyhook
>+Enable [disable] a low-level keyboard hook for catching
>+special key combinations like Alt+Tab and passing them to the X
>+Server instead of letting \fIWindows\fP handle them.
>+.TP 8
>+.B \-lesspointer
>+Hide the Windows mouse cursor when the mouse is over any Cygwin/X
>+window (regardless of whether that window is active or inactive).  This
>+prevents the Windows mouse cursor from being placed overtop of the X
>+cursor.
>+.TP 8
>+.B "\-logfile \fIFile_Name\fP"
>+Change the log file from the default located at \fI/tmp/XWin.log\fP to
>+the one indicated by \fIFile_Name\fP.
>+.TP 8
>+.B "\-logverbose \fIlevel\fP"
>+Control the degree of verbosity of the log messages with the integer
>+parameter \fIlevel\fP.  For \fIlevel\fP=0 only fatal errors are
>+reported, for \fIlevel\fP=1 (default) simple information about
>+configuration is also given, for \fIlevel\fP=2 a detailed log
>+information (including trace and debug output) is produced.  Bigger
>+values will yield a still more detailed debug output.  At this date
>+(April 2004) the option is still not fully operative; the default
>+value is 2 and the output is insensitive to the level value.
>+.TP 8
>+.B \-multimonitors
>+Create a root window that covers all monitors on a system with
>+multiple monitors.
>+.TP 8
>+.B \-multiwindow
>+Start the integrated \fIWindowsi\fP-based window manager, which launches each
>+top-level X window in its own \fIWindows\fP window.  Not to be used together
>+with \fB\-rootless\fP nor \fB\-fullscreen\fP.
>+.TP 8
>+.B \-nodecoration
>+Do not give the Cygwin/X window a Windows window border, title bar,
>+etc.  This parameter only applies to windowed mode screens, i.e., this
>+parameter is ignored when the \fB\-fullscreen\fP parameter is specified.
>+.TP 8
>+.B \-nounicodeclipboard
>+Do not use Unicode clipboard even if NT-based platform.
>+.TP 8
>+.B \-rootless
>+Run the server in rootless mode.  Not to be used with \fB\-multiwindow\fP
>+nor with \fB\-fullscreen\fP.
>+.TP 8
>+.B "\-screen \fIscreen_number\fP \fIwidth\fP \fIheight\fP"
>+This parameter may be used to specify the
>+.I screen_number,
>+.I height,
>+and
>+.I width
>+of one or several Cygwin/X screens; each Cygwin/X screen will be
>+opened in its own window.  When using multiple screens, be sure not to
>+duplicate any screen numbers.
>+.I XWin
>+default behavior is to create a single screen that is roughly
>+the size of the current Windows display area.
>+Screen specific parameters, such as \fB\-fullscreen\fP, can be applied as a
>+default to all screens by placing those screen specific parameters
>+before any \fB\-screen\fP parameter.  Screen specific parameters placed after
>+the first \fB\-screen\fP parameter will apply only to the immediately
>+preceeding \fB\-screen\fP parameter.
>+.TP 8
>+.B \-scrollbars
>+In windowed mode, allow screens bigger than the Windows desktop.
>+Moreover, if the window has decorations, one can now resize it.
>+.TP 8
>+.B \-[no]trayicon
>+Do not create a tray icon.  Default is to create one
>+icon per screen.  You can globally disable tray icons with
>+\fB\-notrayicon\fP, then enable it for specific screens with
>+\fB\-trayicon\fP for those screens.
>+.TP 8
>+.B \-[no]unixkill
>+Enable or disable the \fICtrl-Alt-Backspace\fP key combination as a
>+signal to exit the X Server.  The \fICtrl-Alt-Backspace\fP key combination
>+is disabled by default.
>+.TP 8
>+.B \-[no]winkill
>+Enable or disable the \fIAlt-F4\fP key combination as a signal to exit the
>+X Server.
>+The \fIAlt-F4\fP key combination is enabled by default.
>+.TP 8
>+.B \-swcursor
>+Disable the usage of the windows cursor and use the X11 software cursor instead.
>+.B \-silent-dup-error
>+If another instance of XWin is found running, exit silently and don't display 
>+the error messge.
>+.TP 8
>+.B "\-xkblayout \fIlayout\fP"
>+.TP 8
>+.B "\-xkbmodel \fImodel\fP"
>+.TP 8
>+.B "\-xkboptions \fIoption\fP"
>+.TP 8
>+.B "\-xkbrules \fIrule\fP"
>+.TP 8
>+.B "\-xkbvariant \fIvariant\fp"
>+These options implement the xkeyboard extension for loading
>+a particular keyboard map as the X server starts.  The behavior is similar
>+to the \fIsetxkbmap\fP program.  The layout data is located at
>+\fI/usr/X11R6/lib/X11/xkb/\fP.  Additional information is found in the
>+README files therein and in the man page of \fIsetxkbmap\fP.  For example
>+in order to load a German layout for a pc105 keyboard one uses
>+the options:
>+.br
>+.I " \-xkblayout de \-xkbmodel pc105"
>+.PP
>+Alternatively one may use the \fIsetxkbmap\fP program after XWin is
>+running or even the \fIxmodmap\fP program for loading the old-style
>+keyboard maps.
>+
>+
>+.SH "SEE ALSO"
>+X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), XWinrc(1), setxkbmap(1)
>+
>+
>+.SH BUGS
>+.I XWin
>+and this man page still have many limitations.  Some of the more obvious
>+ones are:
>+.br
>+- The display mode can not be changed once the X server has started.
>+.br
>+- The XWin software is developing rapidly; it is therefore likely that
>+this man page is not up to date.  It is always prudent to 
>+look also at the output of \fIXWin -help\fP and to the Cygwin/X User Guide
>+at /usr/share/doc/cygwin-x-doc-x.x.x/ug/cygwin-x-ug.xxx in order to
>+check the options that are operative.
>+
>+
>+.SH AUTHORS
>+This list is by no means complete, but direct contributors to the
>+Cygwin/X project include (in alphabetical order by last name): Stuart
>+Adamson, Michael Bax, Jehan Bing, Lev Bishop, Dr. Peter Busch, Biju G
>+C, Robert Collins, Nick Crabtree, Early Ehlinger, Christopher Faylor,
>+John Fortin, Brian Genisio, Fabrizio Gennari, Alexander Gottwald, Ralf
>+Habacker, Colin Harrison, Matthieu Herrb, Alan Hourihane, Pierre A
>+Humblet, Harold L Hunt II, Dakshinamurthy Karra, Kensuke Matsuzaki,
>+Takuma Murakami, Earle F. Philhower III, Benjamin Riefenstahl, Suhaib
>+Siddiqi, Jack Tanner, and Nicholas Wourms.
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xwin/XWinrc.1 xorg-server-0.99.4/hw/xwin/XWinrc.1
>--- xorg-server-0.99.3/hw/xwin/XWinrc.1	2004-06-21 06:19:32.000000000 -0700
>+++ xorg-server-0.99.4/hw/xwin/XWinrc.1	1969-12-31 16:00:00.000000000 -0800
>@@ -1,180 +0,0 @@
>-.TH XWIN 5 __vendorversion__
>-
>-
>-.SH NAME
>-XWinrc\- XWin Server Resource Configuration File.
>-
>-
>-.SH DESCRIPTION
>-The X Server for the X Window System on the Cygwin/X environment
>-running on Microsoft Windows, \fIXWin\fP can be optionally configured
>-with the \fIXWinrc\fP file.  A system-wide configuration file should
>-be placed in \fI/usr/X11R6/lib/X11/system.XWinrc\fP, a per-user file
>-should be put at \fI$HOME/.XWinrc\fP.  The \fIsystem.XWinrc\fP file is
>-read only if no \fI$HOME/.XWinrc\fP exist.
>-.PP
>-With the \fI.XWinrc\fP configuration file it is possible to do the
>-following:
>-.PP
>-1- To include items into the menu associated with the \fIXWin\fP icon
>-which is in the \fIWindows\fP system tray.  This feature functions in
>-all XWin modes that have such tray icon.
>-.PP
>-2- To include items into the menu which is associated with the
>-\fIWindows\fP window that \fIXWin -multiwindow\fP produces for each
>-top-level X-window.  That can be done both for the generic case and
>-for particular programs.
>-.PP
>-3- To change the icon that is associated to the \fIWindows\fP window
>-that \fIXWin -multiwindow\fP produces for each top-level X-window.
>-Again, that can be done both for the generic case and for particular
>-programs.  The new icons associated should be \fIWindows\fP format
>-icons \fI.ico\fP.
>-
>-
>-.SH FILE FORMAT
>-.B Keywords
>-are case insensitive, but in this document they will be written
>-completely capitalized.
>-.PP
>-.B Comments
>-are legal pretty much anywhere you can have an end-of-line; they
>-begin with "#" or "//" and go to the end-of-line.
>-.PP
>-Quote marks in strings are optional unless the string has included spaces.
>-.PP
>-There are three kinds of instructions: miscellaneous, menu, and icon.
>-
>-
>-.SH Miscellaneous instruction
>-.TP 8
>-.B DEBUG \fIString\fP
>-The \fIString\fP is printed to the XWin.log file.
>-
>-.TP 8
>-.B TRAYICON \fIicon-specifier\fB
>-The \fBTRAYICON\fP keyword changes the icon \fIXWin\fP displays in the
>-system tray area.
>-
>-.TP 8
>-.B SILENTEXIT
>-The \fBSILENTEXIT\fP keyword, which takes no parameters, disables the
>-exit confirmation dialog.
>-
>-
>-.SH Menu instructions
>-.TP 8
>-.B MENU \fIMenu_Name\fP {
>-.br
>-.B       \fIMenu_Item_Line\fP
>-.br
>-.B       \fIMenu_Item_Line\fP
>-.br
>-.B        \fI...\fP
>-.br
>-.B }
>-.br
>-This instruction defines a menu and asigns a \fIMenu_Name\fP to it.
>-\fIMenu_Item_Line\fP are lines  of any of the following types:
>-.TP 8
>-.B \t SEPARATOR
>-.TP 8
>-.B  \t \fIItem_Label\fP  EXEC \fICommand\fP
>-.TP 8
>-.B \t \fIItem_Label\fP  MENU \fIpreviously-defined-menu-name\fP
>-.TP 8
>-.B \t \fIItem_Label\fP  ALWAYSONTOP
>-.TP 8
>-.B \t \fIItem_Label\fP  RELOAD
>-.br
>-The \fIItem_Label\fP is the string that is written in the menu item.
>-.br
>-\fICommand\fP is a string with the command that will be executed by /bin/sh.
>-Here paths should be \fICYGWIN\fP style (e.g. /usr/local/bin/myprogram).
>-A string "%display%" appearing in the \fICommand\fP will be replaced
>-with the proper display variable (i.e. 127.0.0.1:<display>.0).
>-.br
>-\fBALWAYSONTOP\fP sets the window to which the menu is associated to
>-display above all others.
>-.br
>-\fBRELOAD\fP causes the XWinrc file to be reloaded and icons and menus
>-regenerated.
>-.TP 8
>-.B ROOTMENU \fIpreviously-defined-menu-name\fP
>-Includes the items in the indicated menu into the menu associated with
>-\fIXWin\fP that appears in the system tray.
>-.TP 8
>-.B DEFAULTSYSMENU \fIpreviously-defined-menu-name\fP ATSTART|ATEND
>-Includes the items in the indicated menu into the menu associated with
>-generic top-level X-Windows in the \fIXWin\fP \fImultiwindow\fP mode.  The
>-keywords \fBATSTART\fP and \fBATEND\fP indicate if such items should be
>-included at the start or at the end of the menu.
>-.TP 8
>-.B SYSMENU {
>-  \fIclass-or-name-of-window\fP \fIdefined-menu-name\fP \fBATSTART|ATEND\fP
>-.br
>-  \fI...\fP
>-.br
>-  \fB}\fP
>-.br
>-Associates a specific menu to a specific WM_CLASS or WM_NAME.
>-
>-
>-.SH Icon Instructions
>-When specifying an \fIicon-file\fP in the following commands several different formats are allowed:
>-.br
>-\fB"NAME.ICO"\fP\fI of an .ico format file\fP
>-.br
>-\t \t ("cygwin.ico", "apple.ico")
>-.br
>-\fB"NAME.DLL,nn"\fP\fI of a .DLL and icon index\fP
>-.br
>-\t \t ("c:\\windows\\system32\\shell32.dll,4" is the default folder icon)
>-.br
>-\fB",nn"\fP\fI index into XWin.EXE internal ICON resources\fP
>-.br
>-\t \t (",101" is the 1st icon inside \fIXWin.EXE\fP)
>-.TP 8
>-.B ICONDIRECTORY \fIWindows-path-to-icon-directory\fP
>-Defines the default directory to search for \ficon-file\fP files.
>-It should be a \fIWindows\fP style path (e.g. C:\\cygwin\\usr\\local\\icons).
>-.TP 8
>-.B DEFAULTICON \fIicon-file\fP
>-Defines a replacement for the standard X icon for applications without
>-specified icons.
>-.TP 8
>-.B ICONS {
>-.br
>- \fIclass-or-name-of-window\fP \fIicon-file\fP
>-.br
>-  \fI...\fP
>-.br
>-  \fB}\fP
>-.br
>-Defines icon replacements windows matching the specified window class or names.
>-If multiple name or class matches occur for a window, only the first one
>-will be used.
>-
>-
>-.SH EXAMPLE
>-.TP 8
>-This example adds an Xterm menu item to the system tray icon
>-\fBMENU systray {
>-.br
>-\t xterm  EXEC "xterm -display %display% -sb -sl 999"
>-.br
>-\t SEPARATOR
>-.br
>-}
>-.br
>-ROOTMENU systray
>-\fP
>-
>-
>-.SH "SEE ALSO"
>- XWin(1)
>-
>-
>-.SH AUTHOR
>-The XWinrc feature of XWin was written primarily by Earle F. Philhower
>-III.
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/hw/xwin/XWinrc.man xorg-server-0.99.4/hw/xwin/XWinrc.man
>--- xorg-server-0.99.3/hw/xwin/XWinrc.man	1969-12-31 16:00:00.000000000 -0800
>+++ xorg-server-0.99.4/hw/xwin/XWinrc.man	2004-06-21 06:19:32.000000000 -0700
>@@ -0,0 +1,180 @@
>+.TH XWIN 5 __vendorversion__
>+
>+
>+.SH NAME
>+XWinrc\- XWin Server Resource Configuration File.
>+
>+
>+.SH DESCRIPTION
>+The X Server for the X Window System on the Cygwin/X environment
>+running on Microsoft Windows, \fIXWin\fP can be optionally configured
>+with the \fIXWinrc\fP file.  A system-wide configuration file should
>+be placed in \fI/usr/X11R6/lib/X11/system.XWinrc\fP, a per-user file
>+should be put at \fI$HOME/.XWinrc\fP.  The \fIsystem.XWinrc\fP file is
>+read only if no \fI$HOME/.XWinrc\fP exist.
>+.PP
>+With the \fI.XWinrc\fP configuration file it is possible to do the
>+following:
>+.PP
>+1- To include items into the menu associated with the \fIXWin\fP icon
>+which is in the \fIWindows\fP system tray.  This feature functions in
>+all XWin modes that have such tray icon.
>+.PP
>+2- To include items into the menu which is associated with the
>+\fIWindows\fP window that \fIXWin -multiwindow\fP produces for each
>+top-level X-window.  That can be done both for the generic case and
>+for particular programs.
>+.PP
>+3- To change the icon that is associated to the \fIWindows\fP window
>+that \fIXWin -multiwindow\fP produces for each top-level X-window.
>+Again, that can be done both for the generic case and for particular
>+programs.  The new icons associated should be \fIWindows\fP format
>+icons \fI.ico\fP.
>+
>+
>+.SH FILE FORMAT
>+.B Keywords
>+are case insensitive, but in this document they will be written
>+completely capitalized.
>+.PP
>+.B Comments
>+are legal pretty much anywhere you can have an end-of-line; they
>+begin with "#" or "//" and go to the end-of-line.
>+.PP
>+Quote marks in strings are optional unless the string has included spaces.
>+.PP
>+There are three kinds of instructions: miscellaneous, menu, and icon.
>+
>+
>+.SH Miscellaneous instruction
>+.TP 8
>+.B DEBUG \fIString\fP
>+The \fIString\fP is printed to the XWin.log file.
>+
>+.TP 8
>+.B TRAYICON \fIicon-specifier\fB
>+The \fBTRAYICON\fP keyword changes the icon \fIXWin\fP displays in the
>+system tray area.
>+
>+.TP 8
>+.B SILENTEXIT
>+The \fBSILENTEXIT\fP keyword, which takes no parameters, disables the
>+exit confirmation dialog.
>+
>+
>+.SH Menu instructions
>+.TP 8
>+.B MENU \fIMenu_Name\fP {
>+.br
>+.B       \fIMenu_Item_Line\fP
>+.br
>+.B       \fIMenu_Item_Line\fP
>+.br
>+.B        \fI...\fP
>+.br
>+.B }
>+.br
>+This instruction defines a menu and asigns a \fIMenu_Name\fP to it.
>+\fIMenu_Item_Line\fP are lines  of any of the following types:
>+.TP 8
>+.B \t SEPARATOR
>+.TP 8
>+.B  \t \fIItem_Label\fP  EXEC \fICommand\fP
>+.TP 8
>+.B \t \fIItem_Label\fP  MENU \fIpreviously-defined-menu-name\fP
>+.TP 8
>+.B \t \fIItem_Label\fP  ALWAYSONTOP
>+.TP 8
>+.B \t \fIItem_Label\fP  RELOAD
>+.br
>+The \fIItem_Label\fP is the string that is written in the menu item.
>+.br
>+\fICommand\fP is a string with the command that will be executed by /bin/sh.
>+Here paths should be \fICYGWIN\fP style (e.g. /usr/local/bin/myprogram).
>+A string "%display%" appearing in the \fICommand\fP will be replaced
>+with the proper display variable (i.e. 127.0.0.1:<display>.0).
>+.br
>+\fBALWAYSONTOP\fP sets the window to which the menu is associated to
>+display above all others.
>+.br
>+\fBRELOAD\fP causes the XWinrc file to be reloaded and icons and menus
>+regenerated.
>+.TP 8
>+.B ROOTMENU \fIpreviously-defined-menu-name\fP
>+Includes the items in the indicated menu into the menu associated with
>+\fIXWin\fP that appears in the system tray.
>+.TP 8
>+.B DEFAULTSYSMENU \fIpreviously-defined-menu-name\fP ATSTART|ATEND
>+Includes the items in the indicated menu into the menu associated with
>+generic top-level X-Windows in the \fIXWin\fP \fImultiwindow\fP mode.  The
>+keywords \fBATSTART\fP and \fBATEND\fP indicate if such items should be
>+included at the start or at the end of the menu.
>+.TP 8
>+.B SYSMENU {
>+  \fIclass-or-name-of-window\fP \fIdefined-menu-name\fP \fBATSTART|ATEND\fP
>+.br
>+  \fI...\fP
>+.br
>+  \fB}\fP
>+.br
>+Associates a specific menu to a specific WM_CLASS or WM_NAME.
>+
>+
>+.SH Icon Instructions
>+When specifying an \fIicon-file\fP in the following commands several different formats are allowed:
>+.br
>+\fB"NAME.ICO"\fP\fI of an .ico format file\fP
>+.br
>+\t \t ("cygwin.ico", "apple.ico")
>+.br
>+\fB"NAME.DLL,nn"\fP\fI of a .DLL and icon index\fP
>+.br
>+\t \t ("c:\\windows\\system32\\shell32.dll,4" is the default folder icon)
>+.br
>+\fB",nn"\fP\fI index into XWin.EXE internal ICON resources\fP
>+.br
>+\t \t (",101" is the 1st icon inside \fIXWin.EXE\fP)
>+.TP 8
>+.B ICONDIRECTORY \fIWindows-path-to-icon-directory\fP
>+Defines the default directory to search for \ficon-file\fP files.
>+It should be a \fIWindows\fP style path (e.g. C:\\cygwin\\usr\\local\\icons).
>+.TP 8
>+.B DEFAULTICON \fIicon-file\fP
>+Defines a replacement for the standard X icon for applications without
>+specified icons.
>+.TP 8
>+.B ICONS {
>+.br
>+ \fIclass-or-name-of-window\fP \fIicon-file\fP
>+.br
>+  \fI...\fP
>+.br
>+  \fB}\fP
>+.br
>+Defines icon replacements windows matching the specified window class or names.
>+If multiple name or class matches occur for a window, only the first one
>+will be used.
>+
>+
>+.SH EXAMPLE
>+.TP 8
>+This example adds an Xterm menu item to the system tray icon
>+\fBMENU systray {
>+.br
>+\t xterm  EXEC "xterm -display %display% -sb -sl 999"
>+.br
>+\t SEPARATOR
>+.br
>+}
>+.br
>+ROOTMENU systray
>+\fP
>+
>+
>+.SH "SEE ALSO"
>+ XWin(1)
>+
>+
>+.SH AUTHOR
>+The XWinrc feature of XWin was written primarily by Earle F. Philhower
>+III.
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/include/dix-config.h xorg-server-0.99.4/include/dix-config.h
>--- xorg-server-0.99.3/include/dix-config.h	2005-11-09 23:57:40.000000000 -0800
>+++ xorg-server-0.99.4/include/dix-config.h	2005-12-03 14:02:35.000000000 -0800
>@@ -58,7 +58,7 @@
> /* #undef H3600_TS */
> 
> /* Support XDM-AUTH*-1 */
>-/* #undef HASXDMAUTH */
>+#define HASXDMAUTH 1
> 
> /* Define to 1 if you have the `getdtablesize' function. */
> #define HAS_GETDTABLESIZE 1
>@@ -177,7 +177,7 @@
> #define HAVE_STRTOL 1
> 
> /* Define to 1 if SYSV IPC is available */
>-#define HAVE_SYSV_IPC 1
>+/* #undef HAVE_SYSV_IPC */
> 
> /* Define to 1 if you have the <sys/agpio.h> header file. */
> /* #undef HAVE_SYS_AGPIO_H */
>@@ -337,13 +337,19 @@
> #define XKB_IN_SERVER 1
> 
> /* Vendor release */
>-#define XORG_RELEASE "Release 6.99.99.902"
>+#define XORG_RELEASE "Release 6.99.99.903"
> 
> /* Current Xorg version */
>-#define XORG_VERSION_CURRENT (((6) * 10000000) + ((99) * 100000) + ((99) * 1000) + 902)
>+#define XORG_VERSION_CURRENT (((6) * 10000000) + ((99) * 100000) + ((99) * 1000) + 903)
> 
> /* Xorg release date */
>-#define XORG_DATE "09 November 2005"
>+#define XORG_DATE "02 December 2005"
>+
>+/* Build Xv Extension */
>+#define XvExtension 1
>+
>+/* Build XvMC Extension */
>+#define XvMCExtension 1
> 
> /* Build XRes extension */
> #define XResExtension 1
>@@ -355,7 +361,7 @@
> #define XTEST 1
> 
> /* Support XTrap extension */
>-/* #undef XTRAP */
>+#define XTRAP 1
> 
> /* Support Xv extension */
> #define XV 1
>@@ -411,7 +417,7 @@
> #define _XSERVER64 1
> 
> /* Define to location of RGB database */
>-/* #undef RGB_PATH */
>+#define RGB_DB "/opt/debrix/share/X11/rgb"
> 
> /* System is BSD-like */
> /* #undef CSRG_BASED */
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/include/dix-config.h.in xorg-server-0.99.4/include/dix-config.h.in
>--- xorg-server-0.99.3/include/dix-config.h.in	2005-11-09 23:57:44.000000000 -0800
>+++ xorg-server-0.99.4/include/dix-config.h.in	2005-12-03 16:00:45.000000000 -0800
>@@ -344,6 +344,12 @@
> /* Xorg release date */
> #undef XORG_DATE
> 
>+/* Build Xv Extension */
>+#undef XvExtension
>+
>+/* Build XvMC Extension */
>+#undef XvMCExtension
>+
> /* Build XRes extension */
> #undef XResExtension
> 
>@@ -410,7 +416,7 @@
> #undef _XSERVER64
> 
> /* Define to location of RGB database */
>-#undef RGB_PATH
>+#undef RGB_DB
> 
> /* System is BSD-like */
> #undef CSRG_BASED
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/include/do-not-use-config.h xorg-server-0.99.4/include/do-not-use-config.h
>--- xorg-server-0.99.3/include/do-not-use-config.h	2005-11-09 23:57:40.000000000 -0800
>+++ xorg-server-0.99.4/include/do-not-use-config.h	2005-12-03 14:02:35.000000000 -0800
>@@ -88,7 +88,7 @@
> #define GLXEXT 1
> 
> /* Support XDM-AUTH*-1 */
>-/* #undef HASXDMAUTH */
>+#define HASXDMAUTH 1
> 
> /* Cygwin has /dev/windows for signaling new win32 messages */
> /* #undef HAS_DEVWINDOWS */
>@@ -228,7 +228,7 @@
> #define HAVE_STRTOL 1
> 
> /* Define to 1 if SYSV IPC is available */
>-#define HAVE_SYSV_IPC 1
>+/* #undef HAVE_SYSV_IPC */
> 
> /* Define to 1 if you have the <sys/agpio.h> header file. */
> /* #undef HAVE_SYS_AGPIO_H */
>@@ -311,13 +311,13 @@
> #define PACKAGE_NAME "xorg-server"
> 
> /* Define to the full name and version of this package. */
>-#define PACKAGE_STRING "xorg-server 0.99.3"
>+#define PACKAGE_STRING "xorg-server 0.99.4"
> 
> /* Define to the one symbol short name of this package. */
> #define PACKAGE_TARNAME "xorg-server"
> 
> /* Define to the version of this package. */
>-#define PACKAGE_VERSION "0.99.3"
>+#define PACKAGE_VERSION "0.99.4"
> 
> /* Internal define for Xinerama */
> #define PANORAMIX 1
>@@ -418,7 +418,7 @@
> #define USE_RGB_TXT 1
> 
> /* Version number of package */
>-#define VERSION "0.99.3"
>+#define VERSION "0.99.4"
> 
> /* Building vgahw module */
> #define WITH_VGAHW 1
>@@ -459,9 +459,6 @@
> /* Support XFixes extension */
> #define XFIXES 1
> 
>-/* Building XFree86 loader */
>-#define XFree86LOADER 1
>-
> /* Building XFree86 server */
> #define XFree86Server 1
> 
>@@ -490,25 +487,25 @@
> #define XKB_IN_SERVER 1
> 
> /* Path to XKB output dir */
>-#define XKM_OUTPUT_DIR "/opt/debrix/share/X11/xkb/compiled"
>+#define XKM_OUTPUT_DIR "/opt/debrix/share/X11/xkb/compiled/"
> 
> /* Building Xorg server */
> #define XORGSERVER 1
> 
> /* Vendor release */
>-#define XORG_DATE "09 November 2005"
>+#define XORG_DATE "02 December 2005"
> 
> /* Vendor man version */
>-#define XORG_MAN_VERSION "Version 6.99.99.902"
>+#define XORG_MAN_VERSION "Version 6.99.99.903"
> 
> /* Vendor release */
>-#define XORG_RELEASE "Release 6.99.99.902"
>+#define XORG_RELEASE "Release 6.99.99.903"
> 
> /* Building Xorg server */
> #define XORG_SERVER 1
> 
> /* Current Xorg version */
>-#define XORG_VERSION_CURRENT (((6) * 10000000) + ((99) * 100000) + ((99) * 1000) + 902)
>+#define XORG_VERSION_CURRENT (((6) * 10000000) + ((99) * 100000) + ((99) * 1000) + 903)
> 
> /* Build Print extension */
> #define XPRINT 1
>@@ -526,7 +523,7 @@
> #define XTEST 1
> 
> /* Support XTrap extension */
>-/* #undef XTRAP */
>+#define XTRAP 1
> 
> /* Support Xv extension */
> #define XV 1
>@@ -540,6 +537,12 @@
> /* Endian order */
> #define X_BYTE_ORDER X_LITTLE_ENDIAN
> 
>+/* Build Xv extension */
>+#define XvExtension 1
>+
>+/* Build XvMC extension */
>+#define XvMCExtension 1
>+
> /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
>    `char[]'. */
> #define YYTEXT_POINTER 1
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/include/do-not-use-config.h.in xorg-server-0.99.4/include/do-not-use-config.h.in
>--- xorg-server-0.99.3/include/do-not-use-config.h.in	2005-11-09 23:55:19.000000000 -0800
>+++ xorg-server-0.99.4/include/do-not-use-config.h.in	2005-12-03 16:00:45.000000000 -0800
>@@ -458,9 +458,6 @@
> /* Support XFixes extension */
> #undef XFIXES
> 
>-/* Building XFree86 loader */
>-#undef XFree86LOADER
>-
> /* Building XFree86 server */
> #undef XFree86Server
> 
>@@ -539,6 +536,12 @@
> /* Endian order */
> #undef X_BYTE_ORDER
> 
>+/* Build Xv extension */
>+#undef XvExtension
>+
>+/* Build XvMC extension */
>+#undef XvMCExtension
>+
> /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
>    `char[]'. */
> #undef YYTEXT_POINTER
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/include/servermd.h xorg-server-0.99.4/include/servermd.h
>--- xorg-server-0.99.3/include/servermd.h	2005-08-24 04:18:31.000000000 -0700
>+++ xorg-server-0.99.4/include/servermd.h	2005-11-14 16:29:23.000000000 -0800
>@@ -168,7 +168,7 @@
> 
> #endif /* hpux || __hppa__ */
> 
>-#if defined(__powerpc__)
>+#if defined(__powerpc__) || defined(__ppc__)
> 
> #define IMAGE_BYTE_ORDER        MSBFirst
> #define BITMAP_BIT_ORDER        MSBFirst
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/include/xorg-config.h xorg-server-0.99.4/include/xorg-config.h
>--- xorg-server-0.99.3/include/xorg-config.h	2005-11-09 18:10:59.000000000 -0800
>+++ xorg-server-0.99.4/include/xorg-config.h	2005-12-03 14:02:36.000000000 -0800
>@@ -13,17 +13,11 @@
> #include <dix-config.h>
> #include <xkb-config.h>
> 
>-/* Building XFree86-based server. */
>-#define XFree86Server 1
>-
> /* Building Xorg server. */
> #define XORGSERVER 1
> 
>-/* Building XFree86 loader. */
>-#define XFree86LOADER 1
>-
> /* Current X.Org version. */
>-#define XORG_VERSION_CURRENT (((6) * 10000000) + ((99) * 100000) + ((99) * 1000) + 902)
>+#define XORG_VERSION_CURRENT (((6) * 10000000) + ((99) * 100000) + ((99) * 1000) + 903)
> 
> /* Need XFree86 libc-replacement typedefs. */
> #define NEED_XF86_TYPES 1
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/include/xorg-config.h.in xorg-server-0.99.4/include/xorg-config.h.in
>--- xorg-server-0.99.3/include/xorg-config.h.in	2005-11-09 23:57:44.000000000 -0800
>+++ xorg-server-0.99.4/include/xorg-config.h.in	2005-12-03 16:00:45.000000000 -0800
>@@ -12,15 +12,9 @@
> #include <dix-config.h>
> #include <xkb-config.h>
> 
>-/* Building XFree86-based server. */
>-#undef XFree86Server
>-
> /* Building Xorg server. */
> #undef XORGSERVER
> 
>-/* Building XFree86 loader. */
>-#undef XFree86LOADER
>-
> /* Current X.Org version. */
> #undef XORG_VERSION_CURRENT
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/include/xorg-server.h xorg-server-0.99.4/include/xorg-server.h
>--- xorg-server-0.99.3/include/xorg-server.h	2005-11-09 23:57:40.000000000 -0800
>+++ xorg-server-0.99.4/include/xorg-server.h	2005-12-03 14:02:35.000000000 -0800
>@@ -48,7 +48,7 @@
> /* #undef H3600_TS */
> 
> /* Support XDM-AUTH*-1 */
>-/* #undef HASXDMAUTH */
>+#define HASXDMAUTH 1
> 
> /* Support SHM */
> #define HAS_SHM 1
>@@ -140,12 +140,6 @@
> /* Support XFree86 Video Mode extension */
> #define XF86VIDMODE 1
> 
>-/* Building XFree86 loader */
>-#define XFree86LOADER 1
>-
>-/* Building XFree86 server */
>-#define XFree86Server 1
>-
> /* Build XDGA support */
> #define XFreeXDGA 1
> 
>@@ -174,10 +168,16 @@
> #define XORGSERVER 1
> 
> /* Vendor release */
>-#define XORG_RELEASE "Release 6.99.99.902"
>+#define XORG_RELEASE "Release 6.99.99.903"
> 
> /* Current Xorg version */
>-#define XORG_VERSION_CURRENT (((6) * 10000000) + ((99) * 100000) + ((99) * 1000) + 902)
>+#define XORG_VERSION_CURRENT (((6) * 10000000) + ((99) * 100000) + ((99) * 1000) + 903)
>+
>+/* Build Xv Extension */
>+#define XvExtension 1
>+
>+/* Build XvMC Extension */
>+#define XvMCExtension 1
> 
> /* Build XRes extension */
> #define XResExtension 1
>@@ -189,7 +189,7 @@
> #define XTEST 1
> 
> /* Support XTrap extension */
>-/* #undef XTRAP */
>+#define XTRAP 1
> 
> /* Support Xv Extension */
> #define XV 1
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/include/xorg-server.h.in xorg-server-0.99.4/include/xorg-server.h.in
>--- xorg-server-0.99.3/include/xorg-server.h.in	2005-11-09 23:57:44.000000000 -0800
>+++ xorg-server-0.99.4/include/xorg-server.h.in	2005-12-03 16:00:45.000000000 -0800
>@@ -139,12 +139,6 @@
> /* Support XFree86 Video Mode extension */
> #undef XF86VIDMODE
> 
>-/* Building XFree86 loader */
>-#undef XFree86LOADER
>-
>-/* Building XFree86 server */
>-#undef XFree86Server
>-
> /* Build XDGA support */
> #undef XFreeXDGA
> 
>@@ -178,6 +172,12 @@
> /* Current Xorg version */
> #undef XORG_VERSION_CURRENT
> 
>+/* Build Xv Extension */
>+#undef XvExtension
>+
>+/* Build XvMC Extension */
>+#undef XvMCExtension
>+
> /* Build XRes extension */
> #undef XResExtension
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/include/xwin-config.h.in xorg-server-0.99.4/include/xwin-config.h.in
>--- xorg-server-0.99.3/include/xwin-config.h.in	2005-11-09 23:57:45.000000000 -0800
>+++ xorg-server-0.99.4/include/xwin-config.h.in	2005-12-03 16:00:46.000000000 -0800
>@@ -6,9 +6,6 @@
>  */
> #include <dix-config.h>
> 
>-/* XFree86 based Xserver */
>-#undef XFree86Server
>-
> /* Winsock networking */
> #undef HAS_WINSOCK
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/lbx/Makefile.am xorg-server-0.99.4/lbx/Makefile.am
>--- xorg-server-0.99.3/lbx/Makefile.am	2005-10-15 12:34:28.000000000 -0700
>+++ xorg-server-0.99.4/lbx/Makefile.am	2005-12-01 22:02:44.000000000 -0800
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = liblbx.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> liblbx_la_SOURCES =				\
> 	lbxcmap.c				\
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/Makefile.am xorg-server-0.99.4/Makefile.am
>--- xorg-server-0.99.3/Makefile.am	2005-11-01 07:01:50.000000000 -0800
>+++ xorg-server-0.99.4/Makefile.am	2005-12-03 09:04:44.000000000 -0800
>@@ -11,7 +11,10 @@
> if CFB
> CFB_DIR=cfb
> CFB16_DIR=cfb16
>+# cfb24 is only used by xf8_32wid, which is only used by sunffb on SPARC
>+if BUILD_XF8_32WID
> CFB24_DIR=cfb24
>+endif
> CFB32_DIR=cfb32
> endif
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/mfb/Makefile.am xorg-server-0.99.4/mfb/Makefile.am
>--- xorg-server-0.99.3/mfb/Makefile.am	2005-07-02 11:59:40.000000000 -0700
>+++ xorg-server-0.99.4/mfb/Makefile.am	2005-12-01 22:02:44.000000000 -0800
>@@ -1,6 +1,8 @@
> noinst_LTLIBRARIES = libmfb.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
>+INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
> 
> libmfb_gen_sources = mfbseg.c mfbpgbwht.c mfbpgbblak.c mfbpgbinv.c mfbigbwht.c \
> 	 mfbigbblak.c mfbpawhite.c mfbpablack.c mfbpainv.c mfbtewhite.c \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/mi/Makefile.am xorg-server-0.99.4/mi/Makefile.am
>--- xorg-server-0.99.3/mi/Makefile.am	2005-07-27 10:35:25.000000000 -0700
>+++ xorg-server-0.99.4/mi/Makefile.am	2005-12-01 22:02:44.000000000 -0800
>@@ -4,7 +4,7 @@
>               migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \
>               mispans.h miwideline.h mistruct.h mifpoly.h
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> # libminimi is for dmx - it has different defines for miinitext.c
> libminimi_la_SOURCES = 	\
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/miext/cw/Makefile.am xorg-server-0.99.4/miext/cw/Makefile.am
>--- xorg-server-0.99.3/miext/cw/Makefile.am	2005-08-02 18:41:34.000000000 -0700
>+++ xorg-server-0.99.4/miext/cw/Makefile.am	2005-12-01 22:02:44.000000000 -0800
>@@ -1,6 +1,8 @@
> noinst_LTLIBRARIES = libcw.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
>+INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
> 
> libcw_la_SOURCES = 	\
> 	cw.c		\
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/miext/damage/Makefile.am xorg-server-0.99.4/miext/damage/Makefile.am
>--- xorg-server-0.99.3/miext/damage/Makefile.am	2005-08-07 12:02:32.000000000 -0700
>+++ xorg-server-0.99.4/miext/damage/Makefile.am	2005-12-01 22:02:44.000000000 -0800
>@@ -1,8 +1,8 @@
> noinst_LTLIBRARIES = libdamage.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
>-INCLUDES = -I$(srcdir)/../cw
>+INCLUDES = -I$(srcdir)/../cw -I$(top_srcdir)/hw/xfree86/os-support
> 
> libdamage_la_SOURCES =	\
> 	damage.c	\
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/miext/layer/Makefile.am xorg-server-0.99.4/miext/layer/Makefile.am
>--- xorg-server-0.99.3/miext/layer/Makefile.am	2005-07-02 11:59:41.000000000 -0700
>+++ xorg-server-0.99.4/miext/layer/Makefile.am	2005-12-01 22:02:44.000000000 -0800
>@@ -1,6 +1,8 @@
> noinst_LTLIBRARIES = liblayer.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
>+INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
> 
> liblayer_la_SOURCES =	\
> 	layer.h		\
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/miext/shadow/Makefile.am xorg-server-0.99.4/miext/shadow/Makefile.am
>--- xorg-server-0.99.3/miext/shadow/Makefile.am	2005-07-11 18:20:36.000000000 -0700
>+++ xorg-server-0.99.4/miext/shadow/Makefile.am	2005-12-01 22:02:44.000000000 -0800
>@@ -1,6 +1,8 @@
> noinst_LTLIBRARIES = libshadow.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>+
>+INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
> 
> sdk_HEADERS = shadow.h
> 
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/os/Makefile.am xorg-server-0.99.4/os/Makefile.am
>--- xorg-server-0.99.3/os/Makefile.am	2005-10-17 00:18:59.000000000 -0700
>+++ xorg-server-0.99.4/os/Makefile.am	2005-12-01 22:02:44.000000000 -0800
>@@ -1,6 +1,6 @@
>-noinst_LTLIBRARIES = libos.la
>+noinst_LTLIBRARIES = libos.la libcwrapper.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> # FIXME: Add support for these in configure.ac
> K5AUTH_SOURCES = k5auth.c
>@@ -19,6 +19,10 @@
> LBX_SOURCES = lbxio.c
> endif
> 
>+if NEED_STRLCAT
>+STRLCAT_SOURCES = strlcat.c strlcpy.c
>+endif
>+
> XORG_SOURCES = log.c
> 
> libos_la_SOURCES = 	\
>@@ -38,6 +42,14 @@
> 	$(XCSECURITY_SOURCES) \
> 	$(XDMCP_SOURCES) \
> 	$(XORG_SOURCES) \
>-	$(LBX_SOURCES)
>+	$(LBX_SOURCES) \
>+	$(STRLCAT_SOURCES)
>+
>+libcwrapper_la_SOURCES = \
>+	$(top_srcdir)/hw/xfree86/os-support/shared/libc_wrapper.c
>+libcwrapper_la_CFLAGS = \
>+	-DSELF_CONTAINED_WRAPPER \
>+	-I$(top_srcdir)/hw/xfree86/os-support \
>+	$(AM_CFLAGS)
> 
> EXTRA_DIST = $(K5AUTH_SOURCES) $(SECURERPC_SOURCES) $(INTERNALMALLOC_SOURCES)
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/os/strlcat.c xorg-server-0.99.4/os/strlcat.c
>--- xorg-server-0.99.3/os/strlcat.c	1969-12-31 16:00:00.000000000 -0800
>+++ xorg-server-0.99.4/os/strlcat.c	2005-07-03 00:01:01.000000000 -0700
>@@ -0,0 +1,61 @@
>+/*	$OpenBSD: strlcat.c,v 1.10 2003/04/12 21:56:39 millert Exp $	*/
>+
>+/*
>+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
>+ *
>+ * Permission to use, copy, modify, and distribute this software for any
>+ * purpose with or without fee is hereby granted, provided that the above
>+ * copyright notice and this permission notice appear in all copies.
>+ *
>+ * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
>+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
>+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
>+ * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
>+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
>+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>+ */
>+/* $XFree86$ */
>+
>+
>+#ifdef HAVE_XORG_CONFIG_H
>+#include <xorg-config.h>
>+#endif
>+
>+#include <sys/types.h>
>+#include <string.h>
>+
>+/*
>+ * Appends src to string dst of size siz (unlike strncat, siz is the
>+ * full size of dst, not space left).  At most siz-1 characters
>+ * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
>+ * Returns strlen(src) + MIN(siz, strlen(initial dst)).
>+ * If retval >= siz, truncation occurred.
>+ */
>+size_t
>+strlcat(char *dst, const char *src, size_t siz)
>+{
>+	register char *d = dst;
>+	register const char *s = src;
>+	register size_t n = siz;
>+	size_t dlen;
>+
>+	/* Find the end of dst and adjust bytes left but don't go past end */
>+	while (n-- != 0 && *d != '\0')
>+		d++;
>+	dlen = d - dst;
>+	n = siz - dlen;
>+
>+	if (n == 0)
>+		return(dlen + strlen(s));
>+	while (*s != '\0') {
>+		if (n != 1) {
>+			*d++ = *s;
>+			n--;
>+		}
>+		s++;
>+	}
>+	*d = '\0';
>+
>+	return(dlen + (s - src));	/* count does not include NUL */
>+}
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/os/strlcpy.c xorg-server-0.99.4/os/strlcpy.c
>--- xorg-server-0.99.3/os/strlcpy.c	1969-12-31 16:00:00.000000000 -0800
>+++ xorg-server-0.99.4/os/strlcpy.c	2005-07-03 00:01:01.000000000 -0700
>@@ -0,0 +1,56 @@
>+/*	$OpenBSD: strlcpy.c,v 1.7 2003/04/12 21:56:39 millert Exp $	*/
>+
>+/*
>+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
>+ *
>+ * Permission to use, copy, modify, and distribute this software for any
>+ * purpose with or without fee is hereby granted, provided that the above
>+ * copyright notice and this permission notice appear in all copies.
>+ *
>+ * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
>+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
>+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
>+ * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
>+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
>+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>+ */
>+/* $XFree86$ */
>+
>+#ifdef HAVE_XORG_CONFIG_H
>+#include <xorg-config.h>
>+#endif
>+
>+#include <sys/types.h>
>+#include <string.h>
>+
>+/*
>+ * Copy src to string dst of size siz.  At most siz-1 characters
>+ * will be copied.  Always NUL terminates (unless siz == 0).
>+ * Returns strlen(src); if retval >= siz, truncation occurred.
>+ */
>+size_t
>+strlcpy(char *dst, const char *src, size_t siz)
>+{
>+	register char *d = dst;
>+	register const char *s = src;
>+	register size_t n = siz;
>+
>+	/* Copy as many bytes as will fit */
>+	if (n != 0 && --n != 0) {
>+		do {
>+			if ((*d++ = *s++) == 0)
>+				break;
>+		} while (--n != 0);
>+	}
>+
>+	/* Not enough room in dst, add NUL and traverse rest of src */
>+	if (n == 0) {
>+		if (siz != 0)
>+			*d = '\0';		/* NUL-terminate dst */
>+		while (*s++)
>+			;
>+	}
>+
>+	return(s - src - 1);	/* count does not include NUL */
>+}
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/randr/Makefile.am xorg-server-0.99.4/randr/Makefile.am
>--- xorg-server-0.99.3/randr/Makefile.am	2005-07-02 11:59:41.000000000 -0700
>+++ xorg-server-0.99.4/randr/Makefile.am	2005-12-01 22:02:44.000000000 -0800
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = librandr.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> librandr_la_SOURCES =	\
> 	mirandr.c	\
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/record/Makefile.am xorg-server-0.99.4/record/Makefile.am
>--- xorg-server-0.99.3/record/Makefile.am	2005-07-02 11:59:41.000000000 -0700
>+++ xorg-server-0.99.4/record/Makefile.am	2005-12-01 22:02:45.000000000 -0800
>@@ -1,7 +1,12 @@
>-noinst_LTLIBRARIES = librecord.la
>+noinst_LTLIBRARIES = librecord.la librecordmodule.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
>+
>+INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
> 
> librecord_la_SOURCES = record.c set.c
> 
>+librecordmodule_la_CFLAGS = $(AM_CFLAGS) @MODULE_DEFINES@
>+librecordmodule_la_SOURCES = record.c set.c
>+
> EXTRA_DIST = set.h
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/render/Makefile.am xorg-server-0.99.4/render/Makefile.am
>--- xorg-server-0.99.3/render/Makefile.am	2005-07-02 11:59:41.000000000 -0700
>+++ xorg-server-0.99.4/render/Makefile.am	2005-12-01 22:02:45.000000000 -0800
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = librender.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> librender_la_SOURCES =	\
> 	animcur.c	\
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/Xext/Makefile.am xorg-server-0.99.4/Xext/Makefile.am
>--- xorg-server-0.99.3/Xext/Makefile.am	2005-10-17 00:18:57.000000000 -0700
>+++ xorg-server-0.99.4/Xext/Makefile.am	2005-12-01 22:02:38.000000000 -0800
>@@ -1,8 +1,14 @@
>-noinst_LTLIBRARIES = libXext.la
>+# libXext.la:        includes all extensions and should be linked into Xvfb,
>+#                    Xnest, Xdmx and Xprt
>+# libXextbuiltin.la: includes those extensions that are built directly into
>+#                    Xorg by default
>+# libXextmodule.la:  includes those extensions that are built into a module
>+#                    that Xorg loads
>+noinst_LTLIBRARIES = libXext.la libXextbuiltin.la libXextmodule.la
> 
>-INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
>+INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod -I$(top_srcdir)/hw/xfree86/os-support
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> sdk_HEADERS = xvdix.h xvmcext.h
> 
>@@ -95,3 +101,36 @@
> 	$(EVI_SRCS)		\
> 	$(MULTIBUFFER_SRCS)	\
> 	$(FONTCACHE_SRCS)
>+
>+libXextbuiltin_la_SOURCES =	\
>+	shape.c			\
>+	sleepuntil.c		\
>+	sleepuntil.h		\
>+	xtest.c			\
>+	xtest1di.c		\
>+	xtest1dd.c		\
>+	xtest1dd.h		\
>+	xf86bigfont.c		\
>+	$(MITSHM_SRCS)		\
>+	$(PANORAMIX_SRCS)	\
>+	$(XCSECURITY_SRCS)	\
>+	$(XEVIE_SRCS)		\
>+	$(XPRINT_SRCS)		\
>+	$(APPGROUP_SRCS)
>+
>+libXextmodule_la_CFLAGS = $(AM_CFLAGS) @MODULE_DEFINES@ -DEXTMODULE
>+libXextmodule_la_SOURCES =	\
>+	bigreq.c		\
>+	mitmisc.c		\
>+	shape.c			\
>+	sync.c			\
>+	xcmisc.c		\
>+	dpms.c			\
>+	dpmsproc.h		\
>+	$(XV_SRCS)		\
>+	$(RES_SRCS)		\
>+	$(SCREENSAVER_SRCS)	\
>+	$(CUP_SRCS)		\
>+	$(EVI_SRCS)		\
>+	$(MULTIBUFFER_SRCS)	\
>+	$(FONTCACHE_SRCS)
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/xfixes/Makefile.am xorg-server-0.99.4/xfixes/Makefile.am
>--- xorg-server-0.99.3/xfixes/Makefile.am	2005-07-02 11:59:42.000000000 -0700
>+++ xorg-server-0.99.4/xfixes/Makefile.am	2005-12-01 22:02:45.000000000 -0800
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libxfixes.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> libxfixes_la_SOURCES = 	\
> 	cursor.c	\
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/Xi/Makefile.am xorg-server-0.99.4/Xi/Makefile.am
>--- xorg-server-0.99.3/Xi/Makefile.am	2005-07-13 14:17:51.000000000 -0700
>+++ xorg-server-0.99.4/Xi/Makefile.am	2005-12-01 22:02:38.000000000 -0800
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libXi.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> libXi_la_SOURCES =	\
> 	allowev.c \
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/xkb/Makefile.am xorg-server-0.99.4/xkb/Makefile.am
>--- xorg-server-0.99.3/xkb/Makefile.am	2005-10-06 21:11:02.000000000 -0700
>+++ xorg-server-0.99.4/xkb/Makefile.am	2005-12-01 22:02:45.000000000 -0800
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) \
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ \
> 	-DHAVE_XKB_CONFIG_H
> 
> DDX_SRCS = \
>@@ -51,5 +51,5 @@
> 
> EXTRA_DIST = xkb.h xkbDflts.h
> 
>-xkbcompileddir = $(XKM_OUTPUT_DIR)
>+xkbcompileddir = $(XKB_COMPILED_DIR)
> dist_xkbcompiled_DATA = README.compiled
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/xorg-server.pc.in xorg-server-0.99.4/xorg-server.pc.in
>--- xorg-server-0.99.3/xorg-server.pc.in	2005-08-30 15:31:52.000000000 -0700
>+++ xorg-server-0.99.4/xorg-server.pc.in	2005-12-01 22:02:36.000000000 -0800
>@@ -8,5 +8,5 @@
> Name: xorg-server
> Description: Modular X.Org X Server
> Version: @PACKAGE_VERSION@
>+Cflags: -I${sdkdir} @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> Libs: -L${libdir}
>-Cflags: -I${sdkdir} -DIN_MODULE -DXFree86Module
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/Xprint/doc/Makefile.am xorg-server-0.99.4/Xprint/doc/Makefile.am
>--- xorg-server-0.99.3/Xprint/doc/Makefile.am	2005-09-29 19:37:56.000000000 -0700
>+++ xorg-server-0.99.4/Xprint/doc/Makefile.am	2005-11-28 14:05:08.000000000 -0800
>@@ -1,11 +1,19 @@
> MAN_SRCS = Xprt.man.pre
> 
>-man1_MANS = Xprt.man
>+appmandir = $(APP_MAN_DIR)
> 
>-all-local: $(man1_MANS)
>-
>-CLEANFILES = $(man1_MANS)
>+appman_SOURCES = Xprt.man
>+appman_DATA = $(appman_SOURCES:man=@APP_MAN_SUFFIX@)
> 
> include $(top_srcdir)/cpprules.in
> 
>-EXTRA_DIST = $(MAN_SRCS) Xprt.html Xprt.sgml
>\ No newline at end of file
>+BUILT_SOURCES = $(appman_SOURCES)
>+CLEANFILES = $(appman_SOURCES) $(appman_DATA)
>+
>+SUFFIXES += .$(APP_MAN_SUFFIX) .man
>+
>+.man.$(APP_MAN_SUFFIX):
>+	-rm -f $@
>+	$(LN_S) $< $@
>+
>+EXTRA_DIST = $(MAN_SRCS) Xprt.html Xprt.sgml
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/Xprint/Makefile.am xorg-server-0.99.4/Xprint/Makefile.am
>--- xorg-server-0.99.3/Xprint/Makefile.am	2005-10-15 13:44:43.000000000 -0700
>+++ xorg-server-0.99.4/Xprint/Makefile.am	2005-12-01 22:02:38.000000000 -0800
>@@ -2,7 +2,9 @@
> 
> bin_PROGRAMS = Xprt
> 
>-Xprt_CFLAGS = @DIX_CFLAGS@ -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  -DXPRINTDIR=\"$(prefix)/X11/xserver\"  
>+Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
>+	-DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
>+	-DXPRINTDIR=\"$(prefix)/X11/xserver\"  
> 
> Xprt_LDFLAGS = -L$(top_srcdir)
> Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/Xprint/pcl/Makefile.am xorg-server-0.99.4/Xprint/pcl/Makefile.am
>--- xorg-server-0.99.3/Xprint/pcl/Makefile.am	2005-08-17 12:03:18.000000000 -0700
>+++ xorg-server-0.99.4/Xprint/pcl/Makefile.am	2005-12-01 22:02:38.000000000 -0800
>@@ -2,7 +2,8 @@
> 
> INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
> 
>-AM_CFLAGS = @DIX_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8
>+AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
>+	-D_XP_PRINT_SERVER_ -DPSZ=8
> 
> libpcl_la_SOURCES =		\
> 	PclArc.c		\
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/Xprint/ps/Makefile.am xorg-server-0.99.4/Xprint/ps/Makefile.am
>--- xorg-server-0.99.3/Xprint/ps/Makefile.am	2005-08-17 12:03:18.000000000 -0700
>+++ xorg-server-0.99.4/Xprint/ps/Makefile.am	2005-12-01 22:02:38.000000000 -0800
>@@ -2,7 +2,8 @@
> 
> INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
> 
>-AM_CFLAGS = @DIX_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT
>+AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
>+	-D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT
> 
> libps_la_SOURCES =		\
> 	PsArc.c			\
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/Xprint/raster/Makefile.am xorg-server-0.99.4/Xprint/raster/Makefile.am
>--- xorg-server-0.99.3/Xprint/raster/Makefile.am	2005-08-17 12:03:18.000000000 -0700
>+++ xorg-server-0.99.4/Xprint/raster/Makefile.am	2005-12-01 22:02:39.000000000 -0800
>@@ -2,7 +2,8 @@
> 
> INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
> 
>-AM_CFLAGS = @DIX_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8
>+AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
>+	-D_XP_PRINT_SERVER_ -DPSZ=8
> 
> libraster_la_SOURCES =		\
> 	RasterAttVal.c		\
>diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile xorg-server-0.99.3/XTrap/Makefile.am xorg-server-0.99.4/XTrap/Makefile.am
>--- xorg-server-0.99.3/XTrap/Makefile.am	2005-10-20 11:52:51.000000000 -0700
>+++ xorg-server-0.99.4/XTrap/Makefile.am	2005-12-01 22:02:38.000000000 -0800
>@@ -1,5 +1,11 @@
>-noinst_LTLIBRARIES = libxtrap.la
>+noinst_LTLIBRARIES = libxtrap.la libxtrapmodule.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS)
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> libxtrap_la_SOURCES = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c
>+
>+libxtrapmodule_la_CFLAGS = \
>+	$(AM_CFLAGS) \
>+	@MODULE_DEFINES@ \
>+	-I$(top_srcdir)/hw/xfree86/os-support
>+libxtrapmodule_la_SOURCES = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c

Actions: View | Splinter Review

Attachments on bug 5332: 4087 | 4088 | 4089

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.