svn merge ^/branches/released

117 files changed, 3471 insertions, 2062 deletions

diff --git a/xorg-server/hw/Makefile.in b/xorg-server/hw/Makefile.in
index 68aee21ec..9a39a8fa7 100644
--- a/xorg-server/hw/Makefile.in
+++ b/xorg-server/hw/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -276,8 +276,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -337,6 +340,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -464,7 +468,7 @@ clean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -489,7 +493,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
diff --git a/xorg-server/hw/dmx/Makefile.in b/xorg-server/hw/dmx/Makefile.in
index 771cc718a..ff9bc4170 100644
--- a/xorg-server/hw/dmx/Makefile.in
+++ b/xorg-server/hw/dmx/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -352,8 +352,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -422,6 +425,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -785,7 +789,7 @@ uninstall-appmanDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -810,7 +814,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
diff --git a/xorg-server/hw/dmx/config/Makefile.in b/xorg-server/hw/dmx/config/Makefile.in
index dc78a2ba3..34b68311a 100644
--- a/xorg-server/hw/dmx/config/Makefile.in
+++ b/xorg-server/hw/dmx/config/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -325,8 +325,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -386,6 +389,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/dmx/doc/Makefile.in b/xorg-server/hw/dmx/doc/Makefile.in
index e5feb7ee6..8722e556d 100644
--- a/xorg-server/hw/dmx/doc/Makefile.in
+++ b/xorg-server/hw/dmx/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -260,8 +260,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -321,6 +324,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -714,10 +718,10 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@HAVE_DOXYGEN_FALSE@clean-local:
+@HAVE_DOXYGEN_FALSE@maintainer-clean-local:
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
@@ -765,7 +769,8 @@ installcheck-am:
 
 maintainer-clean: maintainer-clean-am
 	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+	maintainer-clean-local
 
 mostlyclean: mostlyclean-am
 
@@ -784,16 +789,16 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool clean-local distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+	clean-libtool distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-local mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 
 @BUILD_LINUXDOC_TRUE@.sgml.txt:
@@ -819,7 +824,7 @@ uninstall-am:
 @HAVE_DOXYGEN_TRUE@html/annotated.html: $(DOXYGEN_SRC)
 @HAVE_DOXYGEN_TRUE@	$(DOXYGEN) $(srcdir)/doxygen.conf
 
-@HAVE_DOXYGEN_TRUE@clean-local:
+@HAVE_DOXYGEN_TRUE@maintainer-clean-local:
 @HAVE_DOXYGEN_TRUE@	rm -rf html/
 
 $(builddir)/doxygen.head:
diff --git a/xorg-server/hw/dmx/examples/Makefile.in b/xorg-server/hw/dmx/examples/Makefile.in
index 5d73b6938..36127b0e5 100644
--- a/xorg-server/hw/dmx/examples/Makefile.in
+++ b/xorg-server/hw/dmx/examples/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -367,8 +367,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -428,6 +431,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/dmx/glxProxy/Makefile.in b/xorg-server/hw/dmx/glxProxy/Makefile.in
index 0661f09b9..2f80f995a 100644
--- a/xorg-server/hw/dmx/glxProxy/Makefile.in
+++ b/xorg-server/hw/dmx/glxProxy/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -274,8 +274,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -335,6 +338,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/dmx/input/Makefile.in b/xorg-server/hw/dmx/input/Makefile.in
index adcfcd25e..101566ce7 100644
--- a/xorg-server/hw/dmx/input/Makefile.in
+++ b/xorg-server/hw/dmx/input/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -288,8 +288,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -349,6 +352,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/kdrive/Makefile.in b/xorg-server/hw/kdrive/Makefile.in
index fc1b68e74..4299e77c5 100644
--- a/xorg-server/hw/kdrive/Makefile.in
+++ b/xorg-server/hw/kdrive/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -276,8 +276,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -337,6 +340,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -462,7 +466,7 @@ clean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -487,7 +491,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
diff --git a/xorg-server/hw/kdrive/Xkdrive.man b/xorg-server/hw/kdrive/Xkdrive.man
deleted file mode 100644
index b37f9f10a..000000000
--- a/xorg-server/hw/kdrive/Xkdrive.man
+++ /dev/null
@@ -1,57 +0,0 @@
-.\" $RCSId: xc/programs/Xserver/hw/kdrive/Xkdrive.man,v 1.3 2001/01/24 00:06:10 dawes Exp $
-.\"
-.TH Xkdrive 1 __vendorversion__
-.SH NAME
-Xkdrive \- tiny X server
-.SH SYNOPSIS
-.B Xvesa
-.RI [ :display ]
-.RI [ option ...]
-
-.B Xfbdev
-.RI [ :display ]
-.RI [ option ...]
-.SH DESCRIPTION
-.B Xkdrive
-is a family of X servers designed to be particularly small.  This
-manual page describes the common functionality of the 
-.B Xkdrive
-servers; for information on a specific X server, please refer to the
-relevant manual page.
-.SH OPTIONS
-In addition to the standard options accepted by all X servers (see
-Xserver(1)), all the 
-.B Xkdrive
-servers accept the following options:
-.TP 8
-.B -card \fIpcmcia\fP
-use pcmcia card as additional screen.
-.TP 8
-.B -dumb
-disable hardware acceleration.
-.TP 8
-.B -origin \fIX\fP,\fIY\fP
-Locates the next screen in the Xinerama virtual screen.
-.TP 8
-.B -screen \fIwidth\fBx\fIheight\fR[\fBx\fIdepth\fR[\fBx\fIfreq\fR]]\fR[\fB@\fIrotation\fR]\fB
-use a screen of the specified \fIwidth\fP, \fIheight\fP, screen \fIdepth\fP, \fIfrequency\fP, and \fIrotation\fP (0, 90, 180 and 270 are legal values).
-.TP 8
-.B -softCursor
-disable the hardware cursor.
-.TP 8
-.B -videoTest
-start the server, pause momentarily, and exit.
-.TP 8
-.B -zaphod
-disable switching screens by moving the pointer across a screen boundary.
-.TP 8
-.B -2button
-enable emulation of a middle mouse button by chording.
-.TP 8
-.B -3button
-disable emulation of a middle mouse button by chording.
-.SH SEE ALSO
-X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), Xvesa(1), Xfbdev(1).
-.SH AUTHORS
-The Xkdrive common core was written by Keith Packard,
-and is based on the Sample Implementation of X.
diff --git a/xorg-server/hw/kdrive/ephyr/Makefile.in b/xorg-server/hw/kdrive/ephyr/Makefile.in
index d2e6a4441..e17146a7b 100644
--- a/xorg-server/hw/kdrive/ephyr/Makefile.in
+++ b/xorg-server/hw/kdrive/ephyr/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -326,8 +326,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -387,6 +390,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -548,7 +552,9 @@ MANDEFS = \
 	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
 	-D__mandir__=$(mandir) \
 	-D__projectroot__=$(prefix) \
-	-D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+	-D__datadir__=$(datadir) \
+	-D__xconfigfile__=$(__XCONFIGFILE__) \
+	-D__xconfigdir__=$(__XCONFIGDIR__) \
 	-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
 	-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
 	-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) 
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.c b/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.c
deleted file mode 100644
index ce3f01852..000000000
--- a/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Xephyr - A kdrive X server thats runs in a host X window.
- *          Authored by Matthew Allum <mallum@openedhand.com>
- * 
- * Copyright © 2007 OpenedHand Ltd 
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of OpenedHand Ltd not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. OpenedHand Ltd makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OpenedHand Ltd BE LIABLE FOR ANY SPECIAL, 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.
- *
- * Authors:
- *    Dodji Seketeli <dodji@openedhand.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
-#endif
-
-#include <X11/Xlibint.h>
-#define _HAVE_XALLOC_DECLS
-#include "ephyrlog.h"
-#include "ephyrhostproxy.h"
-#include "hostx.h"
-
-/* byte swap a short */
-#define swaps(x, n) { \
-    n = ((char *) (x))[0];\
-    ((char *) (x))[0] = ((char *) (x))[1];\
-    ((char *) (x))[1] = n; }
-
-#define GetXReq(req) \
-    WORD64ALIGN ;\
-    if ((dpy->bufptr + SIZEOF(xReq)) > dpy->bufmax)\
-            _XFlush(dpy);\
-    req = (xReq *)(dpy->last_req = dpy->bufptr);\
-    dpy->bufptr += SIZEOF(xReq);\
-    dpy->request++
-
-
-Bool
-ephyrHostProxyDoForward (pointer a_request_buffer,
-                         struct XReply *a_reply,
-                         Bool a_do_swap)
-{
-    Bool is_ok = FALSE ;
-    int n=0 ;
-    Display *dpy=hostx_get_display () ;
-    xReq *in_req = (xReq*) a_request_buffer ;
-    xReq *forward_req=NULL ;
-    struct XReply reply ;
-
-    EPHYR_RETURN_VAL_IF_FAIL (in_req && dpy, FALSE) ;
-
-    EPHYR_LOG ("enter\n") ;
-
-    if (a_do_swap) {
-        swaps (&in_req->length, n) ;
-    }
-    EPHYR_LOG ("Req {type:%d, data:%d, length:%d}\n",
-               in_req->reqType, in_req->data, in_req->length) ;
-    GetXReq (forward_req) ;
-    memmove (forward_req, in_req, 4) ;
-
-    if (!_XReply (dpy, (xReply*) &reply, 0, FALSE)) {
-        EPHYR_LOG_ERROR ("failed to get reply\n") ;
-        goto out;
-    }
-    EPHYR_LOG ("XReply{type:%d, foo:%d, seqnum:%d, length:%d}\n",
-               reply.type, reply.foo, reply.sequence_number, reply.length) ;
-
-    if (a_reply) {
-        memmove (a_reply, &reply, sizeof (reply)) ;
-    }
-    is_ok = TRUE ;
-
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
-}
-
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.h b/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.h
deleted file mode 100644
index 720c986ff..000000000
--- a/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Xephyr - A kdrive X server thats runs in a host X window.
- *          Authored by Matthew Allum <mallum@openedhand.com>
- * 
- * Copyright © 2007 OpenedHand Ltd 
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of OpenedHand Ltd not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. OpenedHand Ltd makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OpenedHand Ltd BE LIABLE FOR ANY SPECIAL, 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.
- *
- * Authors:
- *    Dodji Seketeli <dodji@openedhand.com>
- */
-
-#ifndef __EPHYRHOSTPROXY_H__
-#define __EPHYRHOSTPROXY_H__
-
-struct XReply {
-    int8_t type ;/*X_Reply*/
-    int8_t foo;
-    int16_t sequence_number ;
-    int32_t length ;
-    /*following is some data up to 32 bytes lenght*/
-    int32_t pad0 ;
-    int32_t pad1 ;
-    int32_t pad2 ;
-    int32_t pad3 ;
-    int32_t pad4 ;
-    int32_t pad5 ;
-};
-
-Bool
-ephyrHostProxyDoForward (pointer a_request_buffer,
-                         struct XReply *a_reply,
-                         Bool a_do_swap) ;
-
-#endif /*__EPHYRHOSTPROXY_H__*/
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrproxyext.c b/xorg-server/hw/kdrive/ephyr/ephyrproxyext.c
deleted file mode 100644
index 0c070f4c7..000000000
--- a/xorg-server/hw/kdrive/ephyr/ephyrproxyext.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Xephyr - A kdrive X server thats runs in a host X window.
- *          Authored by Matthew Allum <mallum@openedhand.com>
- * 
- * Copyright © 2007 OpenedHand Ltd 
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of OpenedHand Ltd not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. OpenedHand Ltd makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OpenedHand Ltd BE LIABLE FOR ANY SPECIAL, 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.
- *
- * Authors:
- *    Dodji Seketeli <dodji@openedhand.com>
- */
-
-/*
- * \file
- * This file defines a proxy extension that forwards requests.
- * When a request to extension FOO is sent to Xephyr, that request is forwared
- * to the host X, without even trying to know what the request means.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
-#endif
-
-#include "misc.h"
-#include "dixstruct.h"
-#include "extnsionst.h"
-#include "ephyrproxyext.h"
-#define _HAVE_XALLOC_DECLS
-#include "ephyrlog.h"
-#include "ephyrhostproxy.h"
-#include "hostx.h"
-
-static Bool ephyrProxyGetHostExtensionInfo (const char *a_ext_name,
-                                            int *a_major_opcode,
-                                            int *a_first_event,
-                                            int *a_first_error) ;
-
-static int ephyrProxyProcDispatch (ClientPtr client) ;
-
-static Bool
-ephyrProxyGetHostExtensionInfo (const char *a_ext_name,
-                                int *a_major_opcode,
-                                int *a_first_event,
-                                int *a_first_error)
-{
-    return hostx_get_extension_info (a_ext_name, a_major_opcode,
-                                     a_first_event, a_first_error) ;
-}
-
-static int
-ephyrProxyProcDispatch (ClientPtr a_client)
-{
-    int res=BadImplementation ;
-    struct XReply reply ;
-
-    if (!ephyrHostProxyDoForward (a_client->requestBuffer, &reply, FALSE)) {
-        EPHYR_LOG_ERROR ("forwarding failed\n") ;
-        goto out ;
-    }
-    reply.sequence_number = a_client->sequence;
-    res = Success ;
-
-    WriteToClient(a_client, 32, (char *)&reply);
-
-out:
-    return res ;
-}
-
-static void
-ephyrProxyProcReset (ExtensionEntry *a_entry)
-{
-}
-
-Bool
-ephyrProxyExtensionInit (const char *a_extension_name)
-{
-    Bool is_ok = FALSE ;
-    int major_opcode=0, first_event=0, first_error=0;
-    ExtensionEntry *ext=NULL ;
-
-    if (!ephyrProxyGetHostExtensionInfo (a_extension_name,
-                                         &major_opcode,
-                                         &first_event,
-                                         &first_error)) {
-        EPHYR_LOG ("failed to query extension %s from host\n", a_extension_name) ;
-        goto out;
-    }
-    ext = AddExtension ((char*)a_extension_name, 0, 0,
-                        ephyrProxyProcDispatch,
-                        ephyrProxyProcDispatch,
-                        ephyrProxyProcReset,
-                        StandardMinorOpcode) ;
-    if (!ext) {
-        EPHYR_LOG_ERROR ("failed to add the extension\n") ;
-        goto out ;
-    }
-    is_ok = TRUE ;
-
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
-}
-
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrproxyext.h b/xorg-server/hw/kdrive/ephyr/ephyrproxyext.h
deleted file mode 100644
index e52f8d887..000000000
--- a/xorg-server/hw/kdrive/ephyr/ephyrproxyext.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Xephyr - A kdrive X server thats runs in a host X window.
- *          Authored by Matthew Allum <mallum@openedhand.com>
- * 
- * Copyright © 2007 OpenedHand Ltd 
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of OpenedHand Ltd not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. OpenedHand Ltd makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OpenedHand Ltd BE LIABLE FOR ANY SPECIAL, 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.
- *
- * Authors:
- *    Dodji Seketeli <dodji@openedhand.com>
- */
-#ifndef __EPHYRPROXYEXT_H__
-#define __EPHYRPROXYEXT_H__
-
-Bool ephyrProxyExtensionInit (const char *a_extension_name) ;
-
-#endif /*__EPHYRPROXYEXT_H__*/
-
diff --git a/xorg-server/hw/kdrive/fake/Makefile.in b/xorg-server/hw/kdrive/fake/Makefile.in
index 81eac9f79..346a1e1c8 100644
--- a/xorg-server/hw/kdrive/fake/Makefile.in
+++ b/xorg-server/hw/kdrive/fake/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -272,8 +272,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -333,6 +336,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/kdrive/fbdev/Makefile.in b/xorg-server/hw/kdrive/fbdev/Makefile.in
index dcae0a02c..b5366e1e3 100644
--- a/xorg-server/hw/kdrive/fbdev/Makefile.in
+++ b/xorg-server/hw/kdrive/fbdev/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -273,8 +273,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -334,6 +337,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/kdrive/fbdev/Xfbdev.man b/xorg-server/hw/kdrive/fbdev/Xfbdev.man
deleted file mode 100644
index bfdae168f..000000000
--- a/xorg-server/hw/kdrive/fbdev/Xfbdev.man
+++ /dev/null
@@ -1,28 +0,0 @@
-.\" $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man,v 1.4 2001/01/27 18:20:40 dawes Exp $
-.\"
-.TH Xfbdev 1 __vendorversion__
-.SH NAME
-Xfbdev \- Linux framebuffer device tiny X server
-.SH SYNOPSIS
-.B Xfbdev
-.RI [ :display ] 
-.RI [ option ...]
-.SH DESCRIPTION
-.B Xfbdev
-is a generic X server for Linux.
-.B Xfbdev
-doesn't know about any particular hardware, and uses the framebuffer
-provided by the Linux framebuffer device.
-.SH OPTIONS
-.B Xfbdev
-accepts the common options of the Xkdrive family of servers.  Please
-see Xkdrive(1).
-.SH KEYBOARD
-To be written.
-.SH SEE ALSO
-X(__miscmansuffix__), Xserver(1), Xkdrive(1), xdm(1), xinit(1).
-.SH AUTHORS
-The
-.B Xfbdev
-server was written by Keith Packard.
-
diff --git a/xorg-server/hw/kdrive/linux/Makefile.in b/xorg-server/hw/kdrive/linux/Makefile.in
index f6e1f5b6e..46615d6e2 100644
--- a/xorg-server/hw/kdrive/linux/Makefile.in
+++ b/xorg-server/hw/kdrive/linux/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34,6 +34,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@KDRIVE_KBD_TRUE@am__append_1 = keyboard.c
+@KDRIVE_EVDEV_TRUE@am__append_2 = evdev.c
+@KDRIVE_MOUSE_TRUE@am__append_3 = mouse.c ms.c ps2.c
+@TSLIB_TRUE@am__append_4 = tslib.c
 subdir = hw/kdrive/linux
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -57,12 +61,14 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 liblinux_la_LIBADD =
-am__liblinux_la_SOURCES_DIST = bus.c mouse.c ms.c ps2.c evdev.c \
-	keyboard.c linux.c tslib.c
-am__objects_1 = evdev.lo keyboard.lo linux.lo
-@TSLIB_TRUE@am__objects_2 = tslib.lo
-am_liblinux_la_OBJECTS = bus.lo mouse.lo ms.lo ps2.lo $(am__objects_1) \
-	$(am__objects_2)
+am__liblinux_la_SOURCES_DIST = linux.c keyboard.c evdev.c mouse.c ms.c \
+	ps2.c tslib.c
+@KDRIVE_KBD_TRUE@am__objects_1 = keyboard.lo
+@KDRIVE_EVDEV_TRUE@am__objects_2 = evdev.lo
+@KDRIVE_MOUSE_TRUE@am__objects_3 = mouse.lo ms.lo ps2.lo
+@TSLIB_TRUE@am__objects_4 = tslib.lo
+am_liblinux_la_OBJECTS = linux.lo $(am__objects_1) $(am__objects_2) \
+	$(am__objects_3) $(am__objects_4)
 liblinux_la_OBJECTS = $(am_liblinux_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -268,8 +274,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -329,6 +338,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -398,20 +408,8 @@ INCLUDES = \
 
 AM_CFLAGS = -DHAVE_DIX_CONFIG_H
 noinst_LTLIBRARIES = liblinux.la
-@TSLIB_TRUE@TSLIB_C = tslib.c
-KDRIVE_HW_SOURCES = \
-	evdev.c		\
-	keyboard.c	\
-	linux.c
-
-liblinux_la_SOURCES = \
-	bus.c		\
-	mouse.c		\
-	ms.c		\
-	ps2.c		\
-	$(KDRIVE_HW_SOURCES) \
-	$(TSLIB_C)
-
+liblinux_la_SOURCES = linux.c $(am__append_1) $(am__append_2) \
+	$(am__append_3) $(am__append_4)
 all: all-am
 
 .SUFFIXES:
@@ -464,7 +462,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bus.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evdev.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyboard.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux.Plo@am__quote@
diff --git a/xorg-server/hw/kdrive/src/Makefile.in b/xorg-server/hw/kdrive/src/Makefile.in
index 9c79b371c..bdb1cda21 100644
--- a/xorg-server/hw/kdrive/src/Makefile.in
+++ b/xorg-server/hw/kdrive/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -57,13 +57,12 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libkdrive_la_LIBADD =
-am__libkdrive_la_SOURCES_DIST = fourcc.h kcmap.c kcurscol.c kdrive.c \
-	kdrive.h kinfo.c kinput.c kmap.c kmode.c kshadow.c kxv.c kxv.h \
+am__libkdrive_la_SOURCES_DIST = fourcc.h kcmap.c kdrive.c kdrive.h \
+	kinfo.c kinput.c kmode.c kshadow.c kxv.c kxv.h \
 	$(top_srcdir)/mi/miinitext.c
 @XV_TRUE@am__objects_1 = kxv.lo
-am_libkdrive_la_OBJECTS = kcmap.lo kcurscol.lo kdrive.lo kinfo.lo \
-	kinput.lo kmap.lo kmode.lo kshadow.lo $(am__objects_1) \
-	miinitext.lo
+am_libkdrive_la_OBJECTS = kcmap.lo kdrive.lo kinfo.lo kinput.lo \
+	kmode.lo kshadow.lo $(am__objects_1) miinitext.lo
 libkdrive_la_OBJECTS = $(am_libkdrive_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -273,8 +272,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -334,6 +336,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -410,12 +413,10 @@ noinst_LTLIBRARIES = libkdrive.la libkdrivestubs.la
 libkdrive_la_SOURCES = \
 	fourcc.h	\
 	kcmap.c		\
-	kcurscol.c	\
 	kdrive.c	\
 	kdrive.h	\
 	kinfo.c		\
 	kinput.c	\
-	kmap.c		\
 	kmode.c		\
 	kshadow.c	\
 	$(KDRIVE_XV_SOURCES) \
@@ -480,11 +481,9 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fbcmap_mi.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcmap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcurscol.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdrive.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kinfo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kinput.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kshadow.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxv.Plo@am__quote@
diff --git a/xorg-server/hw/vfb/Makefile.in b/xorg-server/hw/vfb/Makefile.in
index e06278ea7..a6012d51a 100644
--- a/xorg-server/hw/vfb/Makefile.in
+++ b/xorg-server/hw/vfb/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -310,8 +310,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -376,6 +379,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -490,7 +494,9 @@ MANDEFS = \
 	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
 	-D__mandir__=$(mandir) \
 	-D__projectroot__=$(prefix) \
-	-D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+	-D__datadir__=$(datadir) \
+	-D__xconfigfile__=$(__XCONFIGFILE__) \
+	-D__xconfigdir__=$(__XCONFIGDIR__) \
 	-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
 	-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
 	-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) 
diff --git a/xorg-server/hw/xfree86/Makefile.in b/xorg-server/hw/xfree86/Makefile.in
index 95d94357c..f403408f3 100644
--- a/xorg-server/hw/xfree86/Makefile.in
+++ b/xorg-server/hw/xfree86/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -323,8 +323,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -384,6 +387,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -478,7 +482,9 @@ MANDEFS = \
 	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
 	-D__mandir__=$(mandir) \
 	-D__projectroot__=$(prefix) \
-	-D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+	-D__datadir__=$(datadir) \
+	-D__xconfigfile__=$(__XCONFIGFILE__) \
+	-D__xconfigdir__=$(__XCONFIGDIR__) \
 	-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
 	-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
 	-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) 
@@ -675,7 +681,7 @@ clean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -700,7 +706,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
diff --git a/xorg-server/hw/xfree86/common/Makefile.in b/xorg-server/hw/xfree86/common/Makefile.in
index 3d95ac325..12341f396 100644
--- a/xorg-server/hw/xfree86/common/Makefile.in
+++ b/xorg-server/hw/xfree86/common/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -315,8 +315,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -376,6 +379,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index fb0ee9c3f..c2d9f49de 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -502,20 +502,67 @@ AddOtherInputDevices(void)
 static Bool
 InputClassMatches(XF86ConfInputClassPtr iclass, InputAttributes *attrs)
 {
-    if (iclass->match_product &&
-        (!attrs->product || !strstr(attrs->product, iclass->match_product)))
-        return FALSE;
-    if (iclass->match_vendor &&
-        (!attrs->vendor || !strstr(attrs->vendor, iclass->match_vendor)))
-        return FALSE;
-    if (iclass->match_device &&
+    char **cur;
+    Bool match;
+
+    if (iclass->match_product) {
+        if (!attrs->product)
+            return FALSE;
+        /* see if any of the values match */
+        for (cur = iclass->match_product, match = FALSE; *cur; cur++)
+            if (strstr(attrs->product, *cur)) {
+                match = TRUE;
+                break;
+            }
+        if (!match)
+            return FALSE;
+    }
+    if (iclass->match_vendor) {
+        if (!attrs->vendor)
+            return FALSE;
+        /* see if any of the values match */
+        for (cur = iclass->match_vendor, match = FALSE; *cur; cur++)
+            if (strstr(attrs->vendor, *cur)) {
+                match = TRUE;
+                break;
+            }
+        if (!match)
+            return FALSE;
+    }
+    if (iclass->match_device) {
+        if (!attrs->device)
+            return FALSE;
+        /* see if any of the values match */
+        for (cur = iclass->match_device, match = FALSE; *cur; cur++)
 #ifdef HAVE_FNMATCH_H
-        (!attrs->device ||
-         fnmatch(iclass->match_device, attrs->device, 0) != 0))
+            if (fnmatch(*cur, attrs->device, FNM_PATHNAME) == 0) {
 #else
-        (!attrs->device || !strstr(attrs->device, iclass->match_device)))
+            if (strstr(attrs->device, *cur)) {
 #endif
-        return FALSE;
+                match = TRUE;
+                break;
+            }
+        if (!match)
+            return FALSE;
+    }
+    if (iclass->match_tag) {
+        if (!attrs->tags)
+            return FALSE;
+
+        for (cur = iclass->match_tag, match = FALSE; *cur && !match; cur++) {
+            const char *tag;
+            for(tag = *attrs->tags; *tag; tag++) {
+                if (!strcmp(tag, *cur)) {
+                    match = TRUE;
+                    break;
+                }
+            }
+        }
+
+        if (!match)
+            return FALSE;
+    }
+
     if (iclass->is_keyboard.set &&
         iclass->is_keyboard.val != !!(attrs->flags & ATTR_KEYBOARD))
         return FALSE;
@@ -538,9 +585,9 @@ InputClassMatches(XF86ConfInputClassPtr iclass, InputAttributes *attrs)
 }
 
 /*
- * Merge in any InputClass configurations. Each InputClass section can
- * add to the original device configuration as well as any previous
- * InputClass sections.
+ * Merge in any InputClass configurations. Options in each InputClass
+ * section have less priority than the original device configuration as
+ * well as any previous InputClass sections.
  */
 static int
 MergeInputClasses(IDevPtr idev, InputAttributes *attrs)
@@ -574,6 +621,27 @@ MergeInputClasses(IDevPtr idev, InputAttributes *attrs)
     return Success;
 }
 
+static Bool
+IgnoreInputClass(IDevPtr idev, InputAttributes *attrs)
+{
+    XF86ConfInputClassPtr cl;
+    Bool ignore;
+
+    for (cl = xf86configptr->conf_inputclass_lst; cl; cl = cl->list.next) {
+        if (!InputClassMatches(cl, attrs))
+            continue;
+        if (xf86findOption(cl->option_lst, "Ignore")) {
+            ignore = xf86CheckBoolOption(cl->option_lst, "Ignore", FALSE);
+            if (ignore)
+                xf86Msg(X_CONFIG,
+                        "%s: Ignoring device from InputClass \"%s\"\n",
+                        idev->identifier, cl->identifier);
+            return ignore;
+        }
+    }
+    return FALSE;
+}
+
 /**
  * Create a new input device, activate and enable it.
  *
@@ -736,6 +804,11 @@ NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,
 
     /* Apply InputClass settings */
     if (attrs) {
+        if (IgnoreInputClass(idev, attrs)) {
+            rval = BadIDChoice;
+            goto unwind;
+        }
+
         rval = MergeInputClasses(idev, attrs);
         if (rval != Success)
             goto unwind;
diff --git a/xorg-server/hw/xfree86/ddc/Makefile.in b/xorg-server/hw/xfree86/ddc/Makefile.in
index 25423ead9..4db870280 100644
--- a/xorg-server/hw/xfree86/ddc/Makefile.in
+++ b/xorg-server/hw/xfree86/ddc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -289,8 +289,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -350,6 +353,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/dixmods/Makefile.in b/xorg-server/hw/xfree86/dixmods/Makefile.in
index 2367215ab..5b0de7102 100644
--- a/xorg-server/hw/xfree86/dixmods/Makefile.in
+++ b/xorg-server/hw/xfree86/dixmods/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -377,8 +377,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -438,6 +441,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -768,7 +772,7 @@ clean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -793,7 +797,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in b/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in
index af288069d..7ebcb66c5 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in
+++ b/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -297,8 +297,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -358,6 +361,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/doc/Makefile.in b/xorg-server/hw/xfree86/doc/Makefile.in
index 6e5c3ecaa..fba837fca 100644
--- a/xorg-server/hw/xfree86/doc/Makefile.in
+++ b/xorg-server/hw/xfree86/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -277,8 +277,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -338,6 +341,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -454,7 +458,7 @@ clean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -479,7 +483,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
diff --git a/xorg-server/hw/xfree86/doc/README.modes b/xorg-server/hw/xfree86/doc/README.modes
deleted file mode 100644
index 894e21313..000000000
--- a/xorg-server/hw/xfree86/doc/README.modes
+++ /dev/null
@@ -1,474 +0,0 @@
-		    Multi-monitor Mode Setting APIs
-	           Keith Packard, <keithp@keithp.com
-		   	   6 March 2007
-
-1. Introduction
-
-This document describes a set of mode setting APIs added in X server version
-1.3 that support multiple monitors per card. These interfaces expose the
-underlying hardware CRTC and output concepts to the xf86 DDX layer so that
-the implementation of initial server setup and mode changes through
-extensions can be shared across drivers. In addition, these new interfaces
-support a new configuration mechanism as well which allows each monitor to
-be customized separately providing a consistent cross-driver configuration
-mechanism that supports the full range of output features.
-
-All of the code implementing this interface can be found in hw/xfree86/modes
-in the X server sources.
-
-2. Overview
-
-This document describes both the driver API and the configuration data
-placed in xorg.conf; these are entirely separate as the driver has no
-interaction with the configuration information at all. Much of the structure
-here is cloned from the RandR extension version 1.2 additions which deal
-with the same kinds of information.
-
-2.1 API overview
-
-The mode setting API is expressed through two new driver-visible objects,
-the 'CRTC' (xf86CrtcRec) and the 'Output' (xf86OutputRec). A CRTC refers to
-hardware within the video system that can scan a subset of the framebuffer
-and generate a video signal. An Output receives that signal and transmits it
-to a monitor, projector or other device.
-
-The xf86CrtcRec and xf86OutputRec contain a small amount of state data
-related to the object along with a pointer to a set of functions provided by
-the driver that manipulate the object in fairly simple ways.
-
-To emulate older behaviour, one of the outputs is picked as the 'compat'
-output; this output changes over time as outputs are detected and used, the
-goal is to always have one 'special' output which is used for operations
-which need a single defined monitor (like XFree86-VidModeExtension mode
-setting, RandR 1.1 mode setting, DDC property setting, etc.).
-
-2.1.1 Output overview 
-
-As outputs are connected to monitors, they hold a list of modes supported by
-the monitor. If the monitor and output support DDC, then the list of modes
-generally comes from the EDID data in the monitor. Otherwise, the server
-uses the standard VESA modes, pruned by monitor timing. If the configuration
-file doesn't contain monitor timing data, the server uses default timing
-information which supports 640x480, 800x600 and 1024x768 all with a 60Hz
-refresh rate.
-
-As hardware often limits possible configuration combinations, each output
-knows the set of CRTCs that it can be connected to as well as the set of
-other outputs which can be simutaneously connected to a CRTC.
-
-2.1.2 CRTC overview
-
-CRTCs serve only to stream frame buffer data to outputs using a mode line.
-Ideally, they would not be presented to the user at all, and in fact the
-configuration file doesn't expose them. The RandR 1.2 protocol does, but the
-hope there is that client-side applications will hide them carefully away.
-
-Each crtc has an associated cursor, along with the current configuration.
-All of the data needed to determine valid configurations is contained within
-the Outputs.
-
-2.2 Configuration overview
-
-As outputs drive monitors, the "Monitor" section has been repurposed to
-define their configuration. This provides for a bit more syntax than
-the large list of driver-specific options that were used in the past for
-similar configuration.
-
-However, the existing "Monitor" section referenced by the active "Screen"
-section no longer has any use at all; some sensible meaning for this
-parameter is needed now that a Screen can have multiple Monitors.
-
-3. Public Functions
-
-3.1 PreInit functions
-
-These functions should be used during the driver PreInit phase, they are
-arranged in the order they should be invoked.
-
-    void
-    xf86CrtcConfigInit (ScrnInfoPtr			scrn
-			const xf86CrtcConfigFuncsRec	*funcs)
-
-This function allocates and initializes structures needed to track CRTC and
-Output state.
-
-    void
-    xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
-			  int minWidth, int minHeight,
-			  int maxWidth, int maxHeight)
-
-This sets the range of screen sizes supported by the driver.
-
-    xf86CrtcPtr
-    xf86CrtcCreate (ScrnInfoPtr             scrn,
-		    const xf86CrtcFuncsRec  *funcs)
-    
-Create one CRTC object. See the discussion below for a description of the
-contents of the xf86CrtcFuncsRec. Note that this is done in PreInit, so it
-should not be re-invoked at each server generation. Create one of these for
-each CRTC present in the hardware.
-    
-    xf86OutputPtr
-    xf86OutputCreate (ScrnInfoPtr              scrn,
-		      const xf86OutputFuncsRec *funcs,
-		      const char	       *name)
-
-Create one Output object. See the discussion below for a description of the
-contents of the xf86OutputFuncsRec. This is also called from PreInit and
-need not be re-invoked at each ScreenInit time. An Output should be created
-for every Output present in the hardware, not just for outputs which have
-detected monitors.
-    
-    Bool
-    xf86OutputRename (xf86OutputPtr output, const char *name)
-
-If necessary, the name of an output can be changed after it is created using
-this function.
-    
-    Bool
-    xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
-
-Using the resources provided, and the configuration specified by the user,
-this function computes an initial configuration for the server. It tries to
-enable as much hardware as possible using some fairly simple heuristics. 
-
-The 'canGrow' parameter indicates that the frame buffer does not have a fixed
-size (fixed size frame buffers are required by XAA). When the frame buffer
-has a fixed size, the configuration selects a 'reasonablely large' frame
-buffer so that common reconfiguration options are possible. For resizable
-frame buffers, the frame buffer is set to the smallest size that encloses
-the desired configuration.
-    
-3.2 ScreenInit functions
-
-These functions should be used during the driver ScreenInit phase.
-
-    Bool
-    xf86DiDGAInit (ScreenPtr screen, unsigned long dga_address)
-
-This function provides driver-independent accelerated DGA support for some
-of the DGA operations; using this, the driver can avoid needing to implement
-any of the rest of DGA.
-
-    Bool
-    xf86SaveScreen(ScreenPtr pScreen, int mode)
-
-Stick this in pScreen->SaveScreen and the core X screen saver will be
-implemented by disabling outputs and crtcs using their dpms functions.
-
-    void
-    xf86DPMSSet(ScrnInfoPtr scrn, int mode, int flags)
-
-Pass this function to xf86DPMSInit and all DPMS mode switching will be
-managed by using the dpms functions provided by the Outputs and CRTCs.
-
-    Bool
-    xf86CrtcScreenInit (ScreenPtr screen)
-
-This function completes the screen initialization process for the crtc and
-output objects. Call it near the end of the ScreenInit function, after the
-frame buffer and acceleration layers have been added.
-
-3.3 EnterVT functions
-
-Functions used during EnterVT, or whenever the current configuration needs
-to be applied to the hardware.
-
-    Bool
-    xf86SetDesiredModes (ScrnInfoPtr scrn)
-
-xf86InitialConfiguration selects the desired configuration at PreInit time;
-when the server finally hits ScreenInit, xf86SetDesiredModes is used by the
-driver to take that configuration and apply it to the hardware. In addition,
-successful mode selection at other times updates the configuration that will
-be used by this function, so LeaveVT/EnterVT pairs can simply invoke this
-and return to the previous configuration.
-
-3.4 SwitchMode functions
-
-Functions called from the pScrn->SwitchMode hook, which is used by the
-XFree86-VidModeExtension and the keypad mode switch commands.
-
-    Bool
-    xf86SetSingleMode (ScrnInfoPtr	scrn, 
-		       DisplayModePtr   desired,
-		       Rotation		rotation)
-
-This function applies the specified mode to all active outputs. Which is to
-say, it picks reasonable modes for all active outputs, attempting to get the
-screen to the specified size while not breaking anything that is currently
-working.
-
-3.7 get_modes functions
-
-Functions called during output->get_modes to help build lists of modes
-
-    xf86MonPtr
-    xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus)
-
-This returns the EDID data structure for the 'output' using the I2C bus
-'pDDCBus'. This has no effect on 'output' itself.
-
-    void
-    xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
-
-Once the EDID data has been fetched, this call applies the EDID data to the
-output object, setting the physical size and also various properties, like
-the DDC root window property (when output is the 'compat' output), and the
-RandR 1.2 EDID output properties.
-
-    DisplayModePtr
-    xf86OutputGetEDIDModes (xf86OutputPtr output)
-
-Given an EDID data structure, this function computes a list of suitable
-modes. This function also applies a sequence of 'quirks' during this process
-so that the returned modes may not actually match the mode data present in
-the EDID data.
-
-3.6 Other functions
-
-These remaining functions in the API can be used by the driver as needed.
-
-    Bool
-    xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
-		     int x, int y)
-
-Applies a mode to a CRTC. All of the outputs which are currently using the
-specified CRTC are included in the mode setting process. 'x' and 'y' are the
-offset within the frame buffer that the crtc is placed at. No checking is
-done in this function to ensure that the mode is usable by the active
-outputs.
-    
-    void
-    xf86ProbeOutputModes (ScrnInfoPtr pScrn, int maxX, int maxY)
-
-This discards the mode lists for all outputs, re-detects monitor presence
-and then acquires new mode lists for all monitors which are not disconnected.
-Monitor configuration data is used to modify the mode lists returned by the
-outputs. 'maxX' and 'maxY' limit the maximum size modes that will be
-returned.
-    
-    void
-    xf86SetScrnInfoModes (ScrnInfoPtr pScrn)
-
-This copies the 'compat' output mode list into the pScrn modes list which is
-used by the XFree86-VidModeExtension and the keypad mode switching
-operations. The current 'desired' mode for the CRTC associated with the
-'compat' output is placed first in this list to indicate the current mode.
-Usually, the driver won't need to call this function as
-xf86InitialConfiguration will do so automatically, as well as any RandR
-functions which reprobe for modes. However, if the driver reprobes for modes
-at other times using xf86ProbeOutputModes, this function needs to be called.
-    
-    Bool
-    xf86DiDGAReInit (ScreenPtr pScreen)
-
-This is similar to xf86SetScrnInfoModes, but it applies the 'compat' output
-mode list to the set of modes advertised by the DGA extension; it needs to
-be called whenever xf86ProbeOutputModes is invoked.
-
-    void
-    xf86DisableUnusedFunctions(ScrnInfoPtr pScrn)
-
-After any sequence of calls using xf86CrtcSetMode, this function cleans up
-any leftover Output and CRTC objects by disabling them, saving power. It is
-safe to call this whenever the server is running as it only disables objects
-which are not currently in use.
-    
-4. CRTC operations
-
-4.1 CRTC functions
-
-These functions provide an abstract interface for the CRTC object; most
-manipulation of the CRTC object is done through these functions.
-
-    void
-    crtc->funcs->dpms (xf86CrtcPtr crtc, int mode)
-
-Where 'mode' is one of DPMSModeOff, DPMSModeSuspend, DPMSModeStandby or
-DPMSModeOn. This requests that the crtc go to the specified power state.
-When changing power states, the output dpms functions are invoked before the
-crtc dpms functions.
-
-    void
-    crtc->funcs->save (xf86CrtcPtr crtc)
-	
-    void
-    crtc->funcs->restore (xf86CrtcPtr crtc)
-
-Preserve/restore any register contents related to the CRTC. These are
-strictly a convenience for the driver writer; if the existing driver has
-fully operation save/restore functions, you need not place any additional
-code here. In particular, the server itself never uses this function.
-
-    Bool
-    crtc->funcs->lock (xf86CrtcPtr crtc)
-	
-    void
-    crtc->funcs->unlock (xf86CrtcPtr crtc)
-
-These functions are invoked around mode setting operations; the intent is
-that DRI locking be done here to prevent DRI applications from manipulating
-the hardware while the server is busy changing the output configuration. If
-the lock function returns FALSE, the unlock function will not be invoked.
-
-    Bool
-    crtc->funcs->mode_fixup (xf86CrtcPtr crtc, 
-			     DisplayModePtr mode,
-			     DisplayModePtr adjusted_mode)
-
-This call gives the CRTC a chance to see what mode will be set and to
-comment on the mode by changing 'adjusted_mode' as needed. This function
-shall not modify the state of the crtc hardware at all. If the CRTC cannot
-accept this mode, this function may return FALSE.
-
-    void
-    crtc->funcs->prepare (xf86CrtcPtr crtc)
-
-This call is made just before the mode is set to make the hardware ready for
-the operation. A usual function to perform here is to disable the crtc so
-that mode setting can occur with clocks turned off and outputs deactivated.
-
-    void
-    crtc->funcs->mode_set (xf86CrtcPtr crtc,
-			   DisplayModePtr mode,
-			   DisplayModePtr adjusted_mode)
-
-This function applies the specified mode (possibly adjusted by the CRTC
-and/or Outputs).
-
-    void
-    crtc->funcs->commit (xf86CrtcPtr crtc)
-
-Once the mode has been applied to the CRTC and Outputs, this function is
-invoked to let the hardware turn things back on.
-
-    void
-    crtc->funcs->gamma_set (xf86CrtcPtr crtc, CARD16 *red,
-			    CARD16 *green, CARD16 *blue, int size)
-
-This function adjusts the gamma ramps for the specified crtc.
-
-    void *
-    crtc->funcs->shadow_allocate (xf86CrtcPtr crtc, int width, int height)
-
-This function allocates frame buffer space for a shadow frame buffer. When
-allocated, the crtc must scan from the shadow instead of the main frame
-buffer. This is used for rotation. The address returned is passed to the
-shadow_create function. This function should return NULL on failure.
-
-    PixmapPtr
-    crtc->funcs->shadow_create (xf86CrtcPtr crtc, void *data,
-				int width, int height)
-
-This function creates a pixmap object that will be used as a shadow of the
-main frame buffer for CRTCs which are rotated or reflected. 'data' is the
-value returned by shadow_allocate.
-
-    void
-    crtc->funcs->shadow_destroy (xf86CrtcPtr crtc, PixmapPtr pPixmap,
-				 void *data)
-
-Destroys any associated shadow objects. If pPixmap is NULL, then a pixmap
-was not created, but 'data' may still be non-NULL indicating that the shadow
-had been allocated.
-
-    void
-    crtc->funcs->destroy (xf86CrtcPtr crtc)
-
-When a CRTC is destroyed (which only happens in error cases), this function
-can clean up any driver-specific data.
-
-4.2 CRTC fields
-
-The CRTC object is not opaque; there are several fields of interest to the
-driver writer.
-
-    struct _xf86Crtc {
-	/**
-	 * Associated ScrnInfo
-	 */
-	ScrnInfoPtr     scrn;
-    
-	/**
-	 * Active state of this CRTC
-	 *
-	 * Set when this CRTC is driving one or more outputs
-	 */
-	Bool            enabled;
-    
-	/** Track whether cursor is within CRTC range  */
-	Bool            cursorInRange;
-    
-	/** Track state of cursor associated with this CRTC */
-	Bool            cursorShown;
-    
-	/**
-	 * Active mode
-	 *
-	 * This reflects the mode as set in the CRTC currently
-	 * It will be cleared when the VT is not active or
-	 * during server startup
-	 */
-	DisplayModeRec  mode;
-	Rotation        rotation;
-	PixmapPtr       rotatedPixmap;
-	void            *rotatedData;
-    
-	/**
-	 * Position on screen
-	 *
-	 * Locates this CRTC within the frame buffer
-	 */
-	int             x, y;
-    
-	/**
-	 * Desired mode
-	 *
-	 * This is set to the requested mode, independent of
-	 * whether the VT is active. In particular, it receives
-	 * the startup configured mode and saves the active mode
-	 * on VT switch.
-	 */
-	DisplayModeRec  desiredMode;
-	Rotation        desiredRotation;
-	int             desiredX, desiredY;
-    
-	/** crtc-specific functions */
-	const xf86CrtcFuncsRec *funcs;
-    
-	/**
-	 * Driver private
-	 *
-	 * Holds driver-private information
-	 */
-	void            *driver_private;
-    #ifdef RANDR_12_INTERFACE
-	/**
-	 * RandR crtc
-	 *
-	 * When RandR 1.2 is available, this
-	 * points at the associated crtc object
-	 */
-	RRCrtcPtr       randr_crtc;
-    #else
-	void            *randr_crtc;
-    #endif
-    };
-
-    
-5. Output functions.
-
-6. Configuration
-
-Because the configuration file syntax is fixed,
-this was done by creating new "Driver" section options that hook specific
-outputs to specific "Monitor" sections in the file. The option:
-section of the form:
-
-	Option	"monitor-VGA" "My VGA Monitor"
-
-connects the VGA output of this driver to the "Monitor" section with
-Identifier "My VGA Monitor". All of the usual monitor options can now be
-placed in that "Monitor" section and will be applied to the VGA output
-configuration.
diff --git a/xorg-server/hw/xfree86/doc/devel/Makefile.in b/xorg-server/hw/xfree86/doc/devel/Makefile.in
index c3776b573..754c3f2d5 100644
--- a/xorg-server/hw/xfree86/doc/devel/Makefile.in
+++ b/xorg-server/hw/xfree86/doc/devel/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -240,8 +240,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -301,6 +304,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/doc/man/Makefile.in b/xorg-server/hw/xfree86/doc/man/Makefile.in
index 992f16cc3..61bb2cc5a 100644
--- a/xorg-server/hw/xfree86/doc/man/Makefile.in
+++ b/xorg-server/hw/xfree86/doc/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -266,8 +266,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -327,6 +330,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -428,7 +432,9 @@ MANDEFS = \
 	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
 	-D__mandir__=$(mandir) \
 	-D__projectroot__=$(prefix) \
-	-D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+	-D__datadir__=$(datadir) \
+	-D__xconfigfile__=$(__XCONFIGFILE__) \
+	-D__xconfigdir__=$(__XCONFIGDIR__) \
 	-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
 	-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
 	-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) 
diff --git a/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre b/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
index 222530b41..c8a3c3ac2 100644
--- a/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -1021,7 +1021,7 @@ The
 entry specifies the name of the driver to use for this input device.
 After all classes have been examined, the
 .RI \*q inputdriver \*q
-module from the final
+module from the first
 .B Driver
 entry will be enabled when using the loadable server.
 .PP
@@ -1039,17 +1039,29 @@ The allowed matching entries are shown below.
 .BI "MatchProduct  \*q" matchproduct \*q
 This entry can be used to check if the substring
 .RI \*q matchproduct \*q
-occurs in the device's product name.
+occurs in the device's product name. Multiple substrings can be matched by
+separating arguments with a '|' character.
 .TP 7
 .BI "MatchVendor  \*q" matchvendor \*q
 This entry can be used to check if the substring
 .RI \*q matchvendor \*q
-occurs in the device's vendor name.
+occurs in the device's vendor name. Multiple substrings can be matched by
+separating arguments with a '|' character.
 .TP 7
 .BI "MatchDevicePath \*q" matchdevice \*q
 This entry can be used to check if the device file matches the
 .RI \*q matchdevice \*q
-pathname pattern.
+pathname pattern. Multiple patterns can be matched by separating arguments
+with a '|' character.
+.TP 7
+.BI "MatchTag \*q" matchtag \*q
+This entry can be used to check if tags assigned by the config backend
+matches the
+.RI \*q matchtag \*q
+pattern.  Multiple patterns can be matched by separating arguments
+with a '|' character. A match is found if at least one of the tags given in
+.RI \*q matchtag \*q
+matches at least one of the tags assigned by the backend.
 .TP 7
 .BI "MatchIsKeyboard     \*q" bool \*q
 .TP 7
@@ -1070,11 +1082,20 @@ When an input device has been matched to the
 .B InputClass
 section, any
 .B Option
-entries are applied to the device. See the
+entries are applied to the device. One
+.B InputClass
+specific
+.B Option
+is recognized. See the
 .B InputDevice
-section above for a description of the various
+section above for a description of the remaining
 .B Option
 entries.
+.TP 7
+.BI "Option \*qIgnore\*q \*q" boolean \*q
+This optional entry specifies that the device should be ignored entirely,
+and not added to the server. This can be useful when the device is handled
+by another program and no X events should be generated.
 .SH "DEVICE SECTION"
 The config file may have multiple
 .B Device
diff --git a/xorg-server/hw/xfree86/doc/sgml/Makefile.in b/xorg-server/hw/xfree86/doc/sgml/Makefile.in
index 0fb1a10ce..8f2b24e3f 100644
--- a/xorg-server/hw/xfree86/doc/sgml/Makefile.in
+++ b/xorg-server/hw/xfree86/doc/sgml/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -260,8 +260,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -321,6 +324,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/dri/Makefile.in b/xorg-server/hw/xfree86/dri/Makefile.in
index 812401a3d..592bb760c 100644
--- a/xorg-server/hw/xfree86/dri/Makefile.in
+++ b/xorg-server/hw/xfree86/dri/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -292,8 +292,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -353,6 +356,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/dri2/Makefile.in b/xorg-server/hw/xfree86/dri2/Makefile.in
index bde6c1aa0..ea77660c5 100644
--- a/xorg-server/hw/xfree86/dri2/Makefile.in
+++ b/xorg-server/hw/xfree86/dri2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -291,8 +291,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -352,6 +355,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/exa/Makefile.in b/xorg-server/hw/xfree86/exa/Makefile.in
index 9a5088fe0..b3eb780d4 100644
--- a/xorg-server/hw/xfree86/exa/Makefile.in
+++ b/xorg-server/hw/xfree86/exa/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -295,8 +295,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -356,6 +359,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -464,7 +468,9 @@ MANDEFS = \
 	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
 	-D__mandir__=$(mandir) \
 	-D__projectroot__=$(prefix) \
-	-D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+	-D__datadir__=$(datadir) \
+	-D__xconfigfile__=$(__XCONFIGFILE__) \
+	-D__xconfigdir__=$(__XCONFIGDIR__) \
 	-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
 	-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
 	-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) 
diff --git a/xorg-server/hw/xfree86/fbdevhw/Makefile.in b/xorg-server/hw/xfree86/fbdevhw/Makefile.in
index 77c4af998..3ededbb5c 100644
--- a/xorg-server/hw/xfree86/fbdevhw/Makefile.in
+++ b/xorg-server/hw/xfree86/fbdevhw/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -300,8 +300,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -361,6 +364,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -463,7 +467,9 @@ MANDEFS = \
 	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
 	-D__mandir__=$(mandir) \
 	-D__projectroot__=$(prefix) \
-	-D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+	-D__datadir__=$(datadir) \
+	-D__xconfigfile__=$(__XCONFIGFILE__) \
+	-D__xconfigdir__=$(__XCONFIGDIR__) \
 	-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
 	-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
 	-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) 
diff --git a/xorg-server/hw/xfree86/i2c/Makefile.in b/xorg-server/hw/xfree86/i2c/Makefile.in
index 8941f8ff5..9b93a76e2 100644
--- a/xorg-server/hw/xfree86/i2c/Makefile.in
+++ b/xorg-server/hw/xfree86/i2c/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -341,8 +341,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -402,6 +405,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/int10/Makefile.in b/xorg-server/hw/xfree86/int10/Makefile.in
index ad75886fc..51c81e1e1 100644
--- a/xorg-server/hw/xfree86/int10/Makefile.in
+++ b/xorg-server/hw/xfree86/int10/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -305,8 +305,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -366,6 +369,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/libxorg.c b/xorg-server/hw/xfree86/libxorg.c
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/xorg-server/hw/xfree86/libxorg.c
diff --git a/xorg-server/hw/xfree86/loader/Makefile.in b/xorg-server/hw/xfree86/loader/Makefile.in
index d17b92392..807676bf4 100644
--- a/xorg-server/hw/xfree86/loader/Makefile.in
+++ b/xorg-server/hw/xfree86/loader/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -265,8 +265,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -326,6 +329,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/loader/sdksyms.c b/xorg-server/hw/xfree86/loader/sdksyms.c
new file mode 100644
index 000000000..66eb840cf
--- /dev/null
+++ b/xorg-server/hw/xfree86/loader/sdksyms.c
@@ -0,0 +1,2350 @@
+/* This file is automatically generated by sdksyms.sh. */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+
+/* These must be included first */
+#include "misc.h"
+#include "miscstruct.h"
+
+
+/* render/Makefile.am */
+#include "picture.h"
+#include "mipict.h"
+#include "glyphstr.h"
+#include "picturestr.h"
+#include "renderedge.h"
+
+
+/* fb/Makefile.am -- module */
+/*
+#include "fb.h"
+#include "fbrop.h"
+#include "fboverlay.h"
+#include "wfbrename.h"
+#include "fbpict.h"
+ */
+
+
+/* miext/shadow/Makefile.am -- module */
+/*
+#include "shadow.h"
+ */
+
+
+/* miext/damage/Makefile.am */
+#include "damage.h"
+#include "damagestr.h"
+
+
+/* Xext/Makefile.am -- half is module, half is builtin */
+/*
+#include "xvdix.h"
+#include "xvmcext.h"
+ */
+#include "geext.h"
+#include "geint.h"
+#include "shmint.h"
+#if XINERAMA
+# include "panoramiXsrv.h"
+# include "panoramiX.h"
+#endif
+
+
+/* hw/xfree86/int10/Makefile.am -- module */
+/*
+#include "xf86int10.h"
+ */
+
+
+/* hw/xfree86/i2c/Makefile.am -- "mostly" modules */
+#include "xf86i2c.h"
+/*
+#include "bt829.h"
+#include "fi1236.h"
+#include "msp3430.h"
+#include "tda8425.h"
+#include "tda9850.h"
+#include "tda9885.h"
+#include "uda1380.h"
+#include "i2c_def.h"
+ */
+
+
+/* hw/xfree86/modes/Makefile.am */
+#include "xf86Crtc.h"
+#include "xf86Modes.h"
+#include "xf86RandR12.h"
+/* #include "xf86Rename.h" */
+
+
+/* hw/xfree86/ddc/Makefile.am */
+#include "edid.h"
+#include "xf86DDC.h"
+
+
+/* hw/xfree86/dri2/Makefile.am -- module */
+/*
+#if DRI2
+# include "dri2.h"
+#endif
+ */
+
+
+/* hw/xfree86/vgahw/Makefile.am -- module */
+/*
+#include "vgaHW.h"
+ */
+
+
+/* hw/xfree86/fbdevhw/Makefile.am -- module */
+/*
+#include "fbdevhw.h"
+ */
+
+
+/* hw/xfree86/common/Makefile.am */
+#include "compiler.h"
+#include "fourcc.h"
+#include "xf86.h"
+#include "xf86Module.h"
+#include "xf86Opt.h"
+#include "xf86PciInfo.h"
+#include "xf86Priv.h"
+#include "xf86Privstr.h"
+#include "xf86cmap.h"
+#include "xf86fbman.h"
+#include "xf86str.h"
+#include "xf86Xinput.h"
+#include "xf86VGAarbiter.h"
+#include "xisb.h"
+#if XV
+# include "xf86xv.h"
+# include "xf86xvmc.h"
+# include "xf86xvpriv.h"
+#endif
+/* XF86VidMode code is in libextmod module */
+/*
+#if XF86VIDMODE
+# include "vidmodeproc.h"
+#endif
+ */
+#include "xorgVersion.h"
+#if defined(__sparc__) || defined(__sparc)
+# include "xf86sbusBus.h"
+#endif
+
+
+/* hw/xfree86/ramdac/Makefile.am */
+#include "BT.h"
+#include "IBM.h"
+#include "TI.h"
+#include "xf86Cursor.h"
+#include "xf86RamDac.h"
+
+
+/* hw/xfree86/shadowfb/Makefile.am -- module */
+/*
+#include "shadowfb.h"
+ */
+
+
+/* hw/xfree86/os-support/solaris/Makefile.am */
+#if defined(sun386)
+# include "agpgart.h"
+#endif
+
+
+/* hw/xfree86/os-support/Makefile.am */
+#include "xf86_OSproc.h"
+#include "xf86_OSlib.h"
+
+
+/* hw/xfree86/os-support/bus/Makefile.am */
+#include "xf86Pci.h"
+#if defined(__sparc__) || defined(__sparc)
+# include "xf86Sbus.h"
+#endif
+
+
+/* hw/xfree86/xaa/Makefile.am -- module */
+/*
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xaarop.h"
+#include "xaaWrapper.h"
+ */
+
+
+/* hw/xfree86/dixmods/extmod/Makefile.am -- module */
+/*
+#include "dgaproc.h"
+ */
+
+
+/* hw/xfree86/parser/Makefile.am */
+#include "xf86Parser.h"
+#include "xf86Optrec.h"
+
+
+/* hw/xfree86/vbe/Makefile.am -- module */
+/*
+#include "vbe.h"
+#include "vbeModes.h"
+ */
+
+
+/* hw/xfree86/dri/Makefile.am -- module */
+/*
+#if XF86DRI
+# include "dri.h"
+# include "sarea.h"
+# include "dristruct.h"
+#endif
+ */
+
+
+/* hw/xfree86/xf8_16bpp/Makefile.am -- module */
+/*
+#include "cfb8_16.h"
+ */
+
+
+/* mi/Makefile.am */
+#include "mibank.h"
+#include "micmap.h"
+#include "miline.h"
+#include "mipointer.h"
+#include "mi.h"
+#include "mibstore.h"
+#include "migc.h"
+#include "mipointrst.h"
+#include "mizerarc.h"
+#include "micoord.h"
+#include "mifillarc.h"
+#include "mispans.h"
+#include "miwideline.h"
+#include "mistruct.h"
+#include "mifpoly.h"
+#include "mioverlay.h"
+
+
+/* randr/Makefile.am */
+#include "randrstr.h"
+#include "rrtransform.h"
+
+
+/* dbe/Makefile.am -- module */
+/*
+#include "dbestruct.h"
+ */
+
+
+/* exa/Makefile.am -- module */
+/*
+#include "exa.h"
+ */
+
+
+/* xfixes/Makefile.am */
+#include "xfixes.h"
+
+
+/* include/Makefile.am */
+#include "XIstubs.h"
+#include "bstore.h"
+#include "bstorestr.h"
+#include "closestr.h"
+#include "closure.h"
+#include "colormap.h"
+#include "colormapst.h"
+#include "hotplug.h"
+#include "cursor.h"
+#include "cursorstr.h"
+#include "dix.h"
+#include "dixaccess.h"
+#include "dixevents.h"
+#include "dixfont.h"
+#include "dixfontstr.h"
+#include "dixgrabs.h"
+#include "dixstruct.h"
+#include "exevents.h"
+#include "extension.h"
+#include "extinit.h"
+#include "extnsionst.h"
+#include "gc.h"
+#include "gcstruct.h"
+#include "globals.h"
+#include "input.h"
+#include "inputstr.h"
+/* already included */
+/*
+#include "misc.h"
+#include "miscstruct.h"
+ */
+#include "opaque.h"
+#include "os.h"
+#include "pixmap.h"
+#include "pixmapstr.h"
+#include "privates.h"
+#include "property.h"
+#include "propertyst.h"
+#include "ptrveloc.h"
+#include "region.h"
+#include "regionstr.h"
+#include "registry.h"
+#include "resource.h"
+#include "rgb.h"
+#include "screenint.h"
+#include "scrnintstr.h"
+#include "selection.h"
+#include "servermd.h"
+#include "site.h"
+#include "swaprep.h"
+#include "swapreq.h"
+#include "validate.h"
+#include "window.h"
+#include "windowstr.h"
+#include "xace.h"
+#include "xkbfile.h"
+#include "xkbsrv.h"
+#include "xkbstr.h"
+#include "xkbrules.h"
+#include "xserver-properties.h"
+
+/*
+ * These symbols are referenced to ensure they
+ * will be available in the X Server binary.
+ */
+/* topdir=../../.. */
+_X_HIDDEN void *xorg_symbols[] = {
+    (void *) &WaitForSomething,
+    (void *) &ReadRequestFromClient,
+    (void *) &InsertFakeRequest,
+    (void *) &ResetCurrentRequest,
+    (void *) &FlushAllOutput,
+    (void *) &FlushIfCriticalOutputPending,
+    (void *) &SetCriticalOutputPending,
+    (void *) &WriteToClient,
+    (void *) &ResetOsBuffers,
+    (void *) &InitConnectionLimits,
+    (void *) &NotifyParentProcess,
+    (void *) &CreateWellKnownSockets,
+    (void *) &ResetWellKnownSockets,
+    (void *) &CloseWellKnownConnections,
+    (void *) &AuthorizationIDOfClient,
+    (void *) &ClientAuthorized,
+    (void *) &EstablishNewConnections,
+    (void *) &CheckConnections,
+    (void *) &CloseDownConnection,
+    (void *) &AddGeneralSocket,
+    (void *) &RemoveGeneralSocket,
+    (void *) &AddEnabledDevice,
+    (void *) &RemoveEnabledDevice,
+    (void *) &OnlyListenToOneClient,
+    (void *) &ListenToAllClients,
+    (void *) &IgnoreClient,
+    (void *) &AttendClient,
+    (void *) &MakeClientGrabImpervious,
+    (void *) &MakeClientGrabPervious,
+    (void *) &GetTimeInMillis,
+    (void *) &AdjustWaitForDelay,
+    (void *) &TimerInit,
+    (void *) &TimerForce,
+    (void *) &TimerSet,
+    (void *) &TimerCheck,
+    (void *) &TimerCancel,
+    (void *) &TimerFree,
+    (void *) &SetScreenSaverTimer,
+    (void *) &FreeScreenSaverTimer,
+    (void *) &AutoResetServer,
+    (void *) &GiveUp,
+    (void *) &UseMsg,
+    (void *) &ProcessCommandLine,
+    (void *) &set_font_authorizations,
+    (void *) &Xalloc,
+    (void *) &Xcalloc,
+    (void *) &Xrealloc,
+    (void *) &Xfree,
+    (void *) &XNFalloc,
+    (void *) &XNFcalloc,
+    (void *) &XNFrealloc,
+    (void *) &Xstrdup,
+    (void *) &XNFstrdup,
+    (void *) &Xprintf,
+    (void *) &Xvprintf,
+    (void *) &XNFprintf,
+    (void *) &XNFvprintf,
+    (void *) &OsSignal,
+    (void *) &OsRegisterSigWrapper,
+    (void *) &auditTrailLevel,
+    (void *) &LockServer,
+    (void *) &UnlockServer,
+    (void *) &OsLookupColor,
+    (void *) &OsInit,
+    (void *) &OsCleanup,
+    (void *) &OsVendorFatalError,
+    (void *) &OsVendorInit,
+    (void *) &OsBlockSignals,
+    (void *) &OsReleaseSignals,
+    (void *) &System,
+    (void *) &Popen,
+    (void *) &Pclose,
+    (void *) &Fopen,
+    (void *) &Fclose,
+    (void *) &CheckUserParameters,
+    (void *) &CheckUserAuthorization,
+    (void *) &AddHost,
+    (void *) &ForEachHostInFamily,
+    (void *) &RemoveHost,
+    (void *) &GetHosts,
+    (void *) &InvalidHost,
+    (void *) &LocalClient,
+    (void *) &LocalClientCred,
+    (void *) &GetLocalClientCreds,
+    (void *) &FreeLocalClientCreds,
+    (void *) &ChangeAccessControl,
+    (void *) &GetAccessControl,
+    (void *) &AddLocalHosts,
+    (void *) &ResetHosts,
+    (void *) &EnableLocalHost,
+    (void *) &DisableLocalHost,
+    (void *) &AccessUsingXdmcp,
+    (void *) &DefineSelf,
+    (void *) &AugmentSelf,
+    (void *) &RegisterAuthorizations,
+    (void *) &InitAuthorization,
+    (void *) &AuthorizationFromID,
+    (void *) &CheckAuthorization,
+    (void *) &ResetAuthorization,
+    (void *) &RemoveAuthorization,
+    (void *) &AddAuthorization,
+    (void *) &ddxProcessArgument,
+    (void *) &ddxUseMsg,
+    (void *) &ReplyCallback,
+    (void *) &FlushCallback,
+    (void *) &AbortDDX,
+    (void *) &ddxGiveUp,
+    (void *) &TimeSinceLastInputEvent,
+    (void *) &strlcpy,
+    (void *) &strlcat,
+    (void *) &LogInit,
+    (void *) &LogClose,
+    (void *) &LogSetParameter,
+    (void *) &LogVWrite,
+    (void *) &LogWrite,
+    (void *) &LogVMessageVerb,
+    (void *) &LogMessageVerb,
+    (void *) &LogMessage,
+    (void *) &FreeAuditTimer,
+    (void *) &AuditF,
+    (void *) &VAuditF,
+    (void *) &FatalError,
+    (void *) &VErrorF,
+    (void *) &ErrorF,
+    (void *) &Error,
+    (void *) &LogPrintMarkers,
+    (void *) &xorg_backtrace,
+    (void *) &xstrtokenize,
+    (void *) &SwapLongs,
+    (void *) &SwapShorts,
+    (void *) &MakePredeclaredAtoms,
+    (void *) &Ones,
+    (void *) &globalSerialNumber,
+    (void *) &serverGeneration,
+    (void *) &AddScreen,
+    (void *) &GetScratchPixmapHeader,
+    (void *) &FreeScratchPixmapHeader,
+    (void *) &CreateScratchPixmapsForScreen,
+    (void *) &FreeScratchPixmapsForScreen,
+    (void *) &AllocatePixmap,
+    (void *) &ValidateGC,
+    (void *) &ChangeGC,
+    (void *) &DoChangeGC,
+    (void *) &dixChangeGC,
+    (void *) &CreateGC,
+    (void *) &CopyGC,
+    (void *) &FreeGC,
+    (void *) &CreateScratchGC,
+    (void *) &FreeGCperDepth,
+    (void *) &CreateGCperDepth,
+    (void *) &CreateDefaultStipple,
+    (void *) &FreeDefaultStipple,
+    (void *) &SetDashes,
+    (void *) &VerifyRectOrder,
+    (void *) &SetClipRects,
+    (void *) &GetScratchGC,
+    (void *) &FreeScratchGC,
+    (void *) &miEmptyBox,
+    (void *) &miEmptyData,
+    (void *) &miBrokenData,
+    (void *) &InitRegions,
+    (void *) &miRegionCreate,
+    (void *) &miRegionInit,
+    (void *) &miRegionDestroy,
+    (void *) &miRegionUninit,
+    (void *) &miRegionCopy,
+    (void *) &miIntersect,
+    (void *) &miUnion,
+    (void *) &miRegionAppend,
+    (void *) &miRegionValidate,
+    (void *) &miRectsToRegion,
+    (void *) &miSubtract,
+    (void *) &miInverse,
+    (void *) &miRectIn,
+    (void *) &miTranslateRegion,
+    (void *) &miRegionReset,
+    (void *) &miRegionBreak,
+    (void *) &miPointInRegion,
+    (void *) &miRegionEqual,
+    (void *) &miRegionNotEmpty,
+    (void *) &miRegionEmpty,
+    (void *) &miRegionExtents,
+    (void *) &miPrintRegion,
+    (void *) &TraverseTree,
+    (void *) &WalkTree,
+    (void *) &CreateRootWindow,
+    (void *) &InitRootWindow,
+    (void *) &RegisterRealChildHeadProc,
+    (void *) &RealChildHead,
+    (void *) &CreateWindow,
+    (void *) &DeleteWindow,
+    (void *) &DestroySubwindows,
+    (void *) &ChangeWindowAttributes,
+    (void *) &ChangeWindowDeviceCursor,
+    (void *) &WindowGetDeviceCursor,
+    (void *) &GetWindowAttributes,
+    (void *) &GravityTranslate,
+    (void *) &ConfigureWindow,
+    (void *) &CirculateWindow,
+    (void *) &ReparentWindow,
+    (void *) &MapWindow,
+    (void *) &MapSubwindows,
+    (void *) &UnmapWindow,
+    (void *) &UnmapSubwindows,
+    (void *) &HandleSaveSet,
+    (void *) &PointInWindowIsVisible,
+    (void *) &NotClippedByChildren,
+    (void *) &SendVisibilityNotify,
+    (void *) &dixSaveScreens,
+    (void *) &SaveScreens,
+    (void *) &FindWindowWithOptional,
+    (void *) &CheckWindowOptionalNeed,
+    (void *) &MakeWindowOptional,
+    (void *) &MoveWindowInStack,
+    (void *) &SetWinSize,
+    (void *) &SetBorderSize,
+    (void *) &ResizeChildrenWinSize,
+    (void *) &ShapeExtensionInit,
+    (void *) &SendShapeNotify,
+    (void *) &CreateBoundingShape,
+    (void *) &CreateClipShape,
+    (void *) &DisableMapUnmapEvents,
+    (void *) &EnableMapUnmapEvents,
+    (void *) &XkbRF_GetComponents,
+    (void *) &XkbRF_LoadRules,
+    (void *) &XkbRF_LoadRulesByName,
+    (void *) &XkbRF_Create,
+    (void *) &XkbRF_Free,
+    (void *) &InputEventList,
+    (void *) &InputEventListLen,
+    (void *) &defaultKeyboardControl,
+    (void *) &defaultPointerControl,
+    (void *) &set_key_down,
+    (void *) &set_key_up,
+    (void *) &key_is_down,
+    (void *) &InitCoreDevices,
+    (void *) &InitXTestDevices,
+    (void *) &AddInputDevice,
+    (void *) &EnableDevice,
+    (void *) &ActivateDevice,
+    (void *) &DisableDevice,
+    (void *) &InitAndStartDevices,
+    (void *) &CloseDownDevices,
+    (void *) &UndisplayDevices,
+    (void *) &RemoveDevice,
+    (void *) &NumMotionEvents,
+    (void *) &RegisterPointerDevice,
+    (void *) &RegisterKeyboardDevice,
+    (void *) &dixLookupDevice,
+    (void *) &QueryMinMaxKeyCodes,
+    (void *) &SetKeySymsMap,
+    (void *) &InitButtonClassDeviceStruct,
+    (void *) &InitValuatorClassDeviceStruct,
+    (void *) &InitPointerAccelerationScheme,
+    (void *) &InitAbsoluteClassDeviceStruct,
+    (void *) &InitFocusClassDeviceStruct,
+    (void *) &InitPtrFeedbackClassDeviceStruct,
+    (void *) &InitStringFeedbackClassDeviceStruct,
+    (void *) &InitBellFeedbackClassDeviceStruct,
+    (void *) &InitLedFeedbackClassDeviceStruct,
+    (void *) &InitIntegerFeedbackClassDeviceStruct,
+    (void *) &InitPointerDeviceStruct,
+    (void *) &InitKeyboardDeviceStruct,
+    (void *) &ApplyPointerMapping,
+    (void *) &BadDeviceMap,
+    (void *) &NoteLedState,
+    (void *) &MaybeStopHint,
+    (void *) &ProcessPointerEvent,
+    (void *) &ProcessKeyboardEvent,
+    (void *) &LegalModifier,
+    (void *) &ProcessInputEvents,
+    (void *) &InitInput,
+    (void *) &GetMaximumEventsNum,
+    (void *) &GetEventList,
+    (void *) &InitEventList,
+    (void *) &FreeEventList,
+    (void *) &CreateClassesChangedEvent,
+    (void *) &GetPointerEvents,
+    (void *) &GetKeyboardEvents,
+    (void *) &GetKeyboardValuatorEvents,
+    (void *) &GetProximityEvents,
+    (void *) &PostSyntheticMotion,
+    (void *) &GetMotionHistorySize,
+    (void *) &AllocateMotionHistory,
+    (void *) &GetMotionHistory,
+    (void *) &AttachDevice,
+    (void *) &GetPairedDevice,
+    (void *) &GetMaster,
+    (void *) &AllocDevicePair,
+    (void *) &DeepCopyDeviceClasses,
+    (void *) &generate_modkeymap,
+    (void *) &change_modmap,
+    (void *) &AllocXTestDevice,
+    (void *) &IsXTestDevice,
+    (void *) &GetXTestDevice,
+    (void *) &SendDevicePresenceEvent,
+    (void *) &GetEventFilter,
+    (void *) &GetWindowXI2Mask,
+    (void *) &NewInputDeviceRequest,
+    (void *) &DeleteInputDeviceRequest,
+    (void *) &DDXRingBell,
+    (void *) &EnableCursor,
+    (void *) &cursorScreenDevPriv,
+    (void *) &rootCursor,
+    (void *) &FreeCursor,
+    (void *) &AllocARGBCursor,
+    (void *) &AllocGlyphCursor,
+    (void *) &CreateRootCursor,
+    (void *) &ServerBitsFromGlyph,
+    (void *) &CursorMetricsFromGlyph,
+    (void *) &CheckCursorConfinement,
+    (void *) &NewCurrentScreen,
+    (void *) &PointerConfinedToScreen,
+    (void *) &GetSpritePosition,
+    (void *) &XineramaGetCursorScreen,
+    (void *) &GEExtensions,
+    (void *) &GERegisterExtension,
+    (void *) &GEInitEvent,
+    (void *) &GEExtensionInit,
+    (void *) &clients,
+    (void *) &serverClient,
+    (void *) &currentMaxClients,
+    (void *) &dispatchExceptionAtReset,
+    (void *) &checkForInput,
+    (void *) &SetInputCheck,
+    (void *) &CloseDownClient,
+    (void *) &UpdateCurrentTime,
+    (void *) &UpdateCurrentTimeIf,
+    (void *) &dixDestroyPixmap,
+    (void *) &InitClient,
+    (void *) &NextAvailableClient,
+    (void *) &SendErrorToClient,
+    (void *) &MarkClientException,
+    (void *) &CreateConnectionBlock,
+    (void *) &CompareISOLatin1Lowered,
+    (void *) &dixLookupWindow,
+    (void *) &dixLookupDrawable,
+    (void *) &dixLookupGC,
+    (void *) &dixLookupClient,
+    (void *) &NoopDDA,
+    (void *) &AlterSaveSetForClient,
+    (void *) &DeleteWindowFromAnySaveSet,
+    (void *) &BlockHandler,
+    (void *) &WakeupHandler,
+    (void *) &RegisterBlockAndWakeupHandlers,
+    (void *) &RemoveBlockAndWakeupHandlers,
+    (void *) &InitBlockAndWakeupHandlers,
+    (void *) &ProcessWorkQueue,
+    (void *) &ProcessWorkQueueZombies,
+    (void *) &QueueWorkProc,
+    (void *) &ClientSleep,
+    (void *) &ClientSignal,
+    (void *) &ClientWakeup,
+    (void *) &ClientIsAsleep,
+    (void *) &MakeAtom,
+    (void *) &ValidAtom,
+    (void *) &NameForAtom,
+    (void *) &AtomError,
+    (void *) &FreeAllAtoms,
+    (void *) &InitAtoms,
+    (void *) &SetVendorRelease,
+    (void *) &SetVendorString,
+    (void *) &SetMaskForEvent,
+    (void *) &ConfineToShape,
+    (void *) &IsParent,
+    (void *) &GetCurrentRootWindow,
+    (void *) &GetSpriteWindow,
+    (void *) &NoticeEventTime,
+    (void *) &EnqueueEvent,
+    (void *) &ActivatePointerGrab,
+    (void *) &DeactivatePointerGrab,
+    (void *) &ActivateKeyboardGrab,
+    (void *) &DeactivateKeyboardGrab,
+    (void *) &ActivateFocusInGrab,
+    (void *) &AllowSome,
+    (void *) &ReleaseActiveGrabs,
+    (void *) &DeliverEventsToWindow,
+    (void *) &DeliverDeviceEvents,
+    (void *) &InitializeSprite,
+    (void *) &UpdateSpriteForScreen,
+    (void *) &WindowHasNewCursor,
+    (void *) &CheckDeviceGrabs,
+    (void *) &DeliverFocusedEvent,
+    (void *) &DeliverGrabbedEvent,
+    (void *) &FixKeyState,
+    (void *) &RecalculateDeliverableEvents,
+    (void *) &OtherClientGone,
+    (void *) &DoFocusEvents,
+    (void *) &SetInputFocus,
+    (void *) &GrabDevice,
+    (void *) &InitEvents,
+    (void *) &CloseDownEvents,
+    (void *) &DeleteWindowFromAnyEvents,
+    (void *) &EventMaskForClient,
+    (void *) &DeliverEvents,
+    (void *) &CheckMotion,
+    (void *) &WriteEventsToClient,
+    (void *) &TryClientEvents,
+    (void *) &WindowsRestructured,
+    (void *) &SetClientPointer,
+    (void *) &PickPointer,
+    (void *) &PickKeyboard,
+    (void *) &IsInterferingGrab,
+    (void *) &ReinitializeRootWindow,
+    (void *) &ScreenRestructured,
+    (void *) &ffs,
+    (void *) &AddCallback,
+    (void *) &DeleteCallback,
+    (void *) &CallCallbacks,
+    (void *) &DeleteCallbackList,
+    (void *) &InitCallbackManager,
+    (void *) &ServerGrabCallback,
+    (void *) &EventCallback,
+    (void *) &DeviceEventCallback,
+    (void *) &XItoCoreType,
+    (void *) &DevHasCursor,
+    (void *) &IsPointerDevice,
+    (void *) &IsKeyboardDevice,
+    (void *) &IsPointerEvent,
+    (void *) &IsMaster,
+    (void *) &CopyKeyClass,
+    (void *) &CorePointerProc,
+    (void *) &CoreKeyboardProc,
+    (void *) &SecurityLookupWindow,
+    (void *) &LookupWindow,
+    (void *) &SecurityLookupDrawable,
+    (void *) &LookupDrawable,
+    (void *) &LookupClient,
+    (void *) &ResourceStateCallback,
+    (void *) &CreateNewResourceType,
+    (void *) &CreateNewResourceClass,
+    (void *) &InitClientResources,
+    (void *) &FakeClientID,
+    (void *) &AddResource,
+    (void *) &FreeResource,
+    (void *) &FreeResourceByType,
+    (void *) &ChangeResourceValue,
+    (void *) &FindClientResourcesByType,
+    (void *) &FindAllClientResources,
+    (void *) &FreeClientNeverRetainResources,
+    (void *) &FreeClientResources,
+    (void *) &FreeAllResources,
+    (void *) &LegalNewID,
+    (void *) &LookupClientResourceComplex,
+    (void *) &dixLookupResourceByType,
+    (void *) &dixLookupResourceByClass,
+    (void *) &GetXIDRange,
+    (void *) &GetXIDList,
+    (void *) &lastResourceType,
+    (void *) &TypeMask,
+    (void *) &SecurityLookupIDByType,
+    (void *) &SecurityLookupIDByClass,
+    (void *) &LookupIDByType,
+    (void *) &LookupIDByClass,
+    (void *) &dixRequestPrivate,
+    (void *) &dixAllocatePrivate,
+    (void *) &dixLookupPrivate,
+    (void *) &dixLookupPrivateAddr,
+    (void *) &dixSetPrivate,
+    (void *) &dixRegisterPrivateInitFunc,
+    (void *) &dixRegisterPrivateDeleteFunc,
+    (void *) &dixFreePrivates,
+    (void *) &dixResetPrivates,
+    (void *) &dixLookupPrivateOffset,
+    (void *) &dixRegisterPrivateOffset,
+    (void *) &PictureCmapPolicy,
+    (void *) &PictureParseCmapPolicy,
+    (void *) &RenderErrBase,
+    (void *) &RenderClientPrivateKey,
+    (void *) &CreateColormap,
+    (void *) &FreeColormap,
+    (void *) &TellLostMap,
+    (void *) &TellGainedMap,
+    (void *) &CopyColormapAndFree,
+    (void *) &AllocColor,
+    (void *) &FakeAllocColor,
+    (void *) &FakeFreeColor,
+    (void *) &FindColor,
+    (void *) &QueryColors,
+    (void *) &FreeClientPixels,
+    (void *) &AllocColorCells,
+    (void *) &AllocColorPlanes,
+    (void *) &FreeColors,
+    (void *) &StoreColors,
+    (void *) &IsMapInstalled,
+    (void *) &ResizeVisualArray,
+    (void *) &screenInfo,
+    (void *) &InitOutput,
+    (void *) &FindGlyphHashSet,
+    (void *) &GlyphUninit,
+    (void *) &FindGlyphHashSet,
+    (void *) &FindGlyphRef,
+    (void *) &FindGlyphByHash,
+    (void *) &HashGlyph,
+    (void *) &FreeGlyph,
+    (void *) &AddGlyph,
+    (void *) &DeleteGlyph,
+    (void *) &FindGlyph,
+    (void *) &AllocateGlyph,
+    (void *) &AllocateGlyphHash,
+    (void *) &ResizeGlyphHash,
+    (void *) &ResizeGlyphSet,
+    (void *) &AllocateGlyphSet,
+    (void *) &FreeGlyphSet,
+    (void *) &PictureScreenPrivateKey,
+    (void *) &PictureWindowPrivateKey,
+    (void *) &PictureType,
+    (void *) &PictFormatType,
+    (void *) &GlyphSetType,
+    (void *) &PictureDestroyWindow,
+    (void *) &PictureCloseScreen,
+    (void *) &PictureStoreColors,
+    (void *) &PictureInitIndexedFormat,
+    (void *) &PictureSetSubpixelOrder,
+    (void *) &PictureGetSubpixelOrder,
+    (void *) &PictureCreateDefaultFormats,
+    (void *) &PictureMatchVisual,
+    (void *) &PictureMatchFormat,
+    (void *) &PictureInit,
+    (void *) &PictureGetFilterId,
+    (void *) &PictureGetFilterName,
+    (void *) &PictureAddFilter,
+    (void *) &PictureSetFilterAlias,
+    (void *) &PictureSetDefaultFilters,
+    (void *) &PictureResetFilters,
+    (void *) &PictureFindFilter,
+    (void *) &SetPicturePictFilter,
+    (void *) &SetPictureFilter,
+    (void *) &PictureFinishInit,
+    (void *) &SetPictureToDefaults,
+    (void *) &CreatePicture,
+    (void *) &ChangePicture,
+    (void *) &SetPictureClipRects,
+    (void *) &SetPictureClipRegion,
+    (void *) &SetPictureTransform,
+    (void *) &CopyPicture,
+    (void *) &ValidatePicture,
+    (void *) &FreePicture,
+    (void *) &FreePictFormat,
+    (void *) &CompositePicture,
+    (void *) &CompositeGlyphs,
+    (void *) &CompositeRects,
+    (void *) &CompositeTrapezoids,
+    (void *) &CompositeTriangles,
+    (void *) &CompositeTriStrip,
+    (void *) &CompositeTriFan,
+    (void *) &PictureGradientColor,
+    (void *) &RenderExtensionInit,
+    (void *) &AddTraps,
+    (void *) &CreateSolidPicture,
+    (void *) &CreateLinearGradientPicture,
+    (void *) &CreateRadialGradientPicture,
+    (void *) &CreateConicalGradientPicture,
+    (void *) &PanoramiXRenderInit,
+    (void *) &PanoramiXRenderReset,
+    (void *) &PictTransform_from_xRenderTransform,
+    (void *) &xRenderTransform_from_PictTransform,
+    (void *) &PictureTransformPoint,
+    (void *) &PictureTransformPoint3d,
+    (void *) &miCreatePicture,
+    (void *) &miDestroyPicture,
+    (void *) &miDestroyPictureClip,
+    (void *) &miChangePictureClip,
+    (void *) &miChangePicture,
+    (void *) &miValidatePicture,
+    (void *) &miChangePictureTransform,
+    (void *) &miChangePictureFilter,
+    (void *) &miCompositeSourceValidate,
+    (void *) &miComputeCompositeRegion,
+    (void *) &miPictureInit,
+    (void *) &miRealizeGlyph,
+    (void *) &miUnrealizeGlyph,
+    (void *) &miGlyphs,
+    (void *) &miRenderColorToPixel,
+    (void *) &miRenderPixelToColor,
+    (void *) &miIsSolidAlpha,
+    (void *) &miCompositeRects,
+    (void *) &miTrapezoidBounds,
+    (void *) &miTrapezoids,
+    (void *) &miPointFixedBounds,
+    (void *) &miTriangleBounds,
+    (void *) &miTriangles,
+    (void *) &miTriStrip,
+    (void *) &miTriFan,
+    (void *) &miCreateAlphaPicture,
+    (void *) &miInitIndexed,
+    (void *) &miCloseIndexed,
+    (void *) &miUpdateIndexed,
+    (void *) &RenderSampleCeilY,
+    (void *) &RenderSampleFloorY,
+    (void *) &RenderEdgeStep,
+    (void *) &RenderEdgeInit,
+    (void *) &RenderLineFixedEdgeInit,
+    (void *) &miDamageCreate,
+    (void *) &miDamageRegister,
+    (void *) &miDamageUnregister,
+    (void *) &miDamageDestroy,
+    (void *) &DamageSetup,
+    (void *) &DamageCreate,
+    (void *) &DamageDrawInternal,
+    (void *) &DamageRegister,
+    (void *) &DamageUnregister,
+    (void *) &DamageDestroy,
+    (void *) &DamageSubtract,
+    (void *) &DamageEmpty,
+    (void *) &DamageRegion,
+    (void *) &DamagePendingRegion,
+    (void *) &DamageRegionAppend,
+    (void *) &DamageRegionProcessPending,
+    (void *) &DamageRegionRendered,
+    (void *) &DamageDamageRegion,
+    (void *) &DamageSetReportAfterOp,
+    (void *) &DamageSetPostRenderingFunctions,
+    (void *) &DamageGetScreenFuncs,
+    (void *) &ClientStateCallback,
+    (void *) &ReplyNotSwappd,
+    (void *) &SmartScheduleTime,
+    (void *) &SmartScheduleInterval,
+    (void *) &SmartScheduleSlice,
+    (void *) &SmartScheduleMaxSlice,
+    (void *) &SmartScheduleDisable,
+    (void *) &SmartScheduleStartTimer,
+    (void *) &SmartScheduleStopTimer,
+    (void *) &SmartScheduleInit,
+    (void *) &currentTime,
+    (void *) &lastDeviceEventTime,
+    (void *) &CompareTimeStamps,
+    (void *) &ClientTimeToServerTime,
+    (void *) &InitialVector,
+    (void *) &ProcVector,
+    (void *) &SwappedProcVector,
+    (void *) &ReplySwapVector,
+    (void *) &ProcBadRequest,
+    (void *) &StandardMinorOpcode,
+    (void *) &MinorOpcodeOfRequest,
+    (void *) &EnableDisableExtension,
+    (void *) &EnableDisableExtensionError,
+    (void *) &InitExtensions,
+    (void *) &CloseDownExtensions,
+    (void *) &EventSwapVector,
+    (void *) &NotImplemented,
+    (void *) &AddExtension,
+    (void *) &AddExtensionAlias,
+    (void *) &CheckExtension,
+    (void *) &GetExtensionEntry,
+    (void *) &GEEventType,
+    (void *) &GEEventBase,
+    (void *) &GEErrorBase,
+    (void *) &GEClientPrivateKey,
+    (void *) &ProcGEVector,
+    (void *) &SProcGEVector,
+    (void *) &ShmRegisterFuncs,
+    (void *) &ShmRegisterFbFuncs,
+    (void *) &ShmSegType,
+    (void *) &ShmCompletionCode,
+    (void *) &BadShmSegCode,
+    (void *) &PanoramiXNumScreens,
+    (void *) &panoramiXdataPtr,
+    (void *) &PanoramiXPixWidth,
+    (void *) &PanoramiXPixHeight,
+    (void *) &PanoramiXTranslateVisualID,
+    (void *) &PanoramiXConsolidate,
+    (void *) &PanoramiXCreateConnectionBlock,
+    (void *) &PanoramiXFindIDByScrnum,
+    (void *) &XineramaRegisterConnectionBlockCallback,
+    (void *) &XineramaDeleteResource,
+    (void *) &XineramaReinitData,
+    (void *) &XineramaScreenRegions,
+    (void *) &XRC_DRAWABLE,
+    (void *) &XRT_WINDOW,
+    (void *) &XRT_PIXMAP,
+    (void *) &XRT_GC,
+    (void *) &XRT_COLORMAP,
+    (void *) &XineramaVisualsEqualPtr,
+    (void *) &XineramaGetImageData,
+    (void *) &xf86CreateI2CBusRec,
+    (void *) &xf86DestroyI2CBusRec,
+    (void *) &xf86I2CBusInit,
+    (void *) &xf86I2CFindBus,
+    (void *) &xf86I2CGetScreenBuses,
+    (void *) &xf86CreateI2CDevRec,
+    (void *) &xf86DestroyI2CDevRec,
+    (void *) &xf86I2CDevInit,
+    (void *) &xf86I2CFindDev,
+    (void *) &xf86I2CProbeAddress,
+    (void *) &xf86I2CWriteRead,
+    (void *) &xf86I2CReadStatus,
+    (void *) &xf86I2CReadByte,
+    (void *) &xf86I2CReadBytes,
+    (void *) &xf86I2CReadWord,
+    (void *) &xf86I2CWriteByte,
+    (void *) &xf86I2CWriteBytes,
+    (void *) &xf86I2CWriteWord,
+    (void *) &xf86I2CWriteVec,
+    (void *) &ConfiguredMonitor,
+    (void *) &dixLookupProperty,
+    (void *) &dixChangeWindowProperty,
+    (void *) &ChangeWindowProperty,
+    (void *) &DeleteProperty,
+    (void *) &DeleteAllWindowProperties,
+    (void *) &defaultScreenSaverTime,
+    (void *) &defaultScreenSaverInterval,
+    (void *) &ScreenSaverTime,
+    (void *) &ScreenSaverInterval,
+    (void *) &screenSaverSuspended,
+    (void *) &defaultFontPath,
+    (void *) &monitorResolution,
+    (void *) &defaultColorVisualClass,
+    (void *) &WindowTable,
+    (void *) &GrabInProgress,
+    (void *) &noTestExtensions,
+    (void *) &dixScreenOrigins,
+    (void *) &ConnectionInfo,
+    (void *) &DPMSStandbyTime,
+    (void *) &DPMSSuspendTime,
+    (void *) &DPMSOffTime,
+    (void *) &DPMSPowerLevel,
+    (void *) &DPMSEnabled,
+    (void *) &DPMSDisabledSwitch,
+    (void *) &DPMSCapableFlag,
+    (void *) &PanoramiXExtensionDisabledHack,
+    (void *) &noCompositeExtension,
+    (void *) &noDamageExtension,
+    (void *) &noDbeExtension,
+    (void *) &noDPMSExtension,
+    (void *) &noGlxExtension,
+    (void *) &noScreenSaverExtension,
+    (void *) &noMITShmExtension,
+    (void *) &noRRExtension,
+    (void *) &noRenderExtension,
+    (void *) &noResExtension,
+    (void *) &noXFree86DGAExtension,
+    (void *) &noXFree86DRIExtension,
+    (void *) &noXFixesExtension,
+    (void *) &noPanoramiXExtension,
+    (void *) &noXvExtension,
+    (void *) &noDRI2Extension,
+    (void *) &defaultTextFont,
+    (void *) &defaultCursorFont,
+    (void *) &MaxClients,
+    (void *) &isItTimeToYield,
+    (void *) &dispatchException,
+    (void *) &TimeOutValue,
+    (void *) &ScreenSaverBlanking,
+    (void *) &ScreenSaverAllowExposures,
+    (void *) &defaultScreenSaverBlanking,
+    (void *) &defaultScreenSaverAllowExposures,
+    (void *) &display,
+    (void *) &defaultBackingStore,
+    (void *) &disableBackingStore,
+    (void *) &enableBackingStore,
+    (void *) &PartialNetwork,
+    (void *) &logoScreenSaver,
+    (void *) &defeatAccessControl,
+    (void *) &maxBigRequestSize,
+    (void *) &party_like_its_1989,
+    (void *) &whiteRoot,
+    (void *) &CoreDump,
+    (void *) &DontPropagateMasks,
+    (void *) &screenIsSaved,
+    (void *) &savedScreenInfo,
+    (void *) &PixmapWidthPaddingInfo,
+    (void *) &RRTransformInit,
+    (void *) &RRTransformFini,
+    (void *) &RRTransformEqual,
+    (void *) &RRTransformSetFilter,
+    (void *) &RRTransformCopy,
+    (void *) &RRTransformCompute,
+    (void *) &RREventBase,
+    (void *) &ProcRandrVector,
+    (void *) &SProcRandrVector,
+    (void *) &rrPrivKey,
+    (void *) &RRClientType,
+    (void *) &RRClientPrivateKey,
+    (void *) &RRCrtcType,
+    (void *) &RRExtensionInit,
+    (void *) &RRScreenSetSizeRange,
+    (void *) &RRScreenSizeNotify,
+    (void *) &RRScreenSizeSet,
+    (void *) &RRSendConfigNotify,
+    (void *) &ProcRRGetScreenSizeRange,
+    (void *) &ProcRRSetScreenSize,
+    (void *) &ProcRRGetScreenResources,
+    (void *) &ProcRRGetScreenResourcesCurrent,
+    (void *) &ProcRRSetScreenConfig,
+    (void *) &ProcRRGetScreenInfo,
+    (void *) &RRDeliverScreenEvent,
+    (void *) &miRandRInit,
+    (void *) &miRRGetInfo,
+    (void *) &miRRCrtcSet,
+    (void *) &miRROutputSetProperty,
+    (void *) &miRROutputGetProperty,
+    (void *) &miRROutputValidateMode,
+    (void *) &miRRModeDestroy,
+    (void *) &RRTellChanged,
+    (void *) &RRGetInfo,
+    (void *) &RRInit,
+    (void *) &RRScreenInit,
+    (void *) &RRFirstOutput,
+    (void *) &RRGetRotation,
+    (void *) &RRVerticalRefresh,
+    (void *) &RRRegisterSize,
+    (void *) &RRRegisterRate,
+    (void *) &RRSetCurrentConfig,
+    (void *) &RRScreenInit,
+    (void *) &RRGetRotation,
+    (void *) &RRCrtcChanged,
+    (void *) &RRCrtcCreate,
+    (void *) &RRCrtcSetRotations,
+    (void *) &RRCrtcSetTransformSupport,
+    (void *) &RRCrtcNotify,
+    (void *) &RRDeliverCrtcEvent,
+    (void *) &RRCrtcSet,
+    (void *) &RRCrtcGammaSet,
+    (void *) &RRCrtcGammaGet,
+    (void *) &RRCrtcGammaNotify,
+    (void *) &RRCrtcGammaSetSize,
+    (void *) &RRCrtcGetScanoutSize,
+    (void *) &RRTransformCompute,
+    (void *) &RRCrtcGetTransform,
+    (void *) &RRCrtcPendingTransform,
+    (void *) &RRCrtcDestroy,
+    (void *) &RRCrtcTransformSet,
+    (void *) &RRCrtcInit,
+    (void *) &ProcRRGetCrtcInfo,
+    (void *) &ProcRRSetCrtcConfig,
+    (void *) &ProcRRGetCrtcGammaSize,
+    (void *) &ProcRRGetCrtcGamma,
+    (void *) &ProcRRSetCrtcGamma,
+    (void *) &ProcRRSetCrtcTransform,
+    (void *) &ProcRRGetCrtcTransform,
+    (void *) &RRClientKnowsRates,
+    (void *) &RRModeGet,
+    (void *) &RRModeDestroy,
+    (void *) &RRModesForScreen,
+    (void *) &RRModeInit,
+    (void *) &ProcRRCreateMode,
+    (void *) &ProcRRDestroyMode,
+    (void *) &ProcRRAddOutputMode,
+    (void *) &ProcRRDeleteOutputMode,
+    (void *) &RROutputChanged,
+    (void *) &RROutputCreate,
+    (void *) &RROutputSetClones,
+    (void *) &RROutputSetModes,
+    (void *) &RROutputAddUserMode,
+    (void *) &RROutputDeleteUserMode,
+    (void *) &RROutputSetCrtcs,
+    (void *) &RROutputSetConnection,
+    (void *) &RROutputSetSubpixelOrder,
+    (void *) &RROutputSetPhysicalSize,
+    (void *) &RRDeliverOutputEvent,
+    (void *) &RROutputDestroy,
+    (void *) &ProcRRGetOutputInfo,
+    (void *) &ProcRRSetOutputPrimary,
+    (void *) &ProcRRGetOutputPrimary,
+    (void *) &RROutputInit,
+    (void *) &RRPointerMoved,
+    (void *) &RRPointerScreenConfigured,
+    (void *) &RRDeleteAllOutputProperties,
+    (void *) &RRGetOutputProperty,
+    (void *) &RRQueryOutputProperty,
+    (void *) &RRDeleteOutputProperty,
+    (void *) &RRPostPendingProperties,
+    (void *) &RRChangeOutputProperty,
+    (void *) &RRConfigureOutputProperty,
+    (void *) &ProcRRChangeOutputProperty,
+    (void *) &ProcRRGetOutputProperty,
+    (void *) &ProcRRListOutputProperties,
+    (void *) &ProcRRQueryOutputProperty,
+    (void *) &ProcRRConfigureOutputProperty,
+    (void *) &ProcRRDeleteOutputProperty,
+    (void *) &RRXineramaExtensionInit,
+    (void *) &ExtensionModuleList,
+    (void *) &LoadSubModule,
+    (void *) &UnloadSubModule,
+    (void *) &UnloadModule,
+    (void *) &LoaderSymbol,
+    (void *) &LoaderListDirs,
+    (void *) &LoaderFreeDirList,
+    (void *) &LoaderErrorMsg,
+    (void *) &LoadExtension,
+    (void *) &LoaderGetOS,
+    (void *) &LoaderShouldIgnoreABI,
+    (void *) &LoaderGetABIVersion,
+    (void *) &xf86SetIntOption,
+    (void *) &xf86SetRealOption,
+    (void *) &xf86SetStrOption,
+    (void *) &xf86SetBoolOption,
+    (void *) &xf86CheckIntOption,
+    (void *) &xf86CheckRealOption,
+    (void *) &xf86CheckStrOption,
+    (void *) &xf86CheckBoolOption,
+    (void *) &xf86AddNewOption,
+    (void *) &xf86NewOption,
+    (void *) &xf86NextOption,
+    (void *) &xf86OptionListCreate,
+    (void *) &xf86OptionListMerge,
+    (void *) &xf86OptionListFree,
+    (void *) &xf86OptionName,
+    (void *) &xf86OptionValue,
+    (void *) &xf86OptionListReport,
+    (void *) &xf86FindOption,
+    (void *) &xf86FindOptionValue,
+    (void *) &xf86MarkOptionUsed,
+    (void *) &xf86MarkOptionUsedByName,
+    (void *) &xf86CheckIfOptionUsed,
+    (void *) &xf86CheckIfOptionUsedByName,
+    (void *) &xf86ShowUnusedOptions,
+    (void *) &xf86ProcessOptions,
+    (void *) &xf86TokenToOptinfo,
+    (void *) &xf86TokenToOptName,
+    (void *) &xf86IsOptionSet,
+    (void *) &xf86GetOptValString,
+    (void *) &xf86GetOptValInteger,
+    (void *) &xf86GetOptValULong,
+    (void *) &xf86GetOptValReal,
+    (void *) &xf86GetOptValFreq,
+    (void *) &xf86GetOptValBool,
+    (void *) &xf86ReturnOptValBool,
+    (void *) &xf86NameCmp,
+    (void *) &xf86NormalizeName,
+    (void *) &xf86ReplaceIntOption,
+    (void *) &xf86ReplaceRealOption,
+    (void *) &xf86ReplaceBoolOption,
+    (void *) &xf86ReplaceStrOption,
+    (void *) &pciTag,
+    (void *) &xf86scanpci,
+    (void *) &xf86MapDomainMemory,
+    (void *) &xf86MapLegacyIO,
+    (void *) &xf86DoConfigure,
+    (void *) &xf86DoShowOptions,
+    (void *) &xf86DoConfigurePass1,
+    (void *) &xf86ScreenKey,
+    (void *) &xf86CreateRootWindowKey,
+    (void *) &xf86PixmapKey,
+    (void *) &xf86Screens,
+    (void *) &byte_reversed,
+    (void *) &pciSlotClaimed,
+    (void *) &fbSlotClaimed,
+    (void *) &xf86ConfigDRI,
+    (void *) &xf86inSuspend,
+    (void *) &xf86DRI2Enabled,
+    (void *) &VTSwitchEnabled,
+    (void *) &xf86CheckPciSlot,
+    (void *) &xf86ClaimPciSlot,
+    (void *) &xf86UnclaimPciSlot,
+    (void *) &xf86ParsePciBusString,
+    (void *) &xf86ComparePciBusString,
+    (void *) &xf86FormatPciBusNumber,
+    (void *) &xf86GetFbInfoForScreen,
+    (void *) &xf86ClaimFbSlot,
+    (void *) &xf86ClaimNoSlot,
+    (void *) &xf86EnableAccess,
+    (void *) &xf86IsPrimaryPci,
+    (void *) &xf86DriverHasEntities,
+    (void *) &xf86AddEntityToScreen,
+    (void *) &xf86SetEntityInstanceForScreen,
+    (void *) &xf86GetNumEntityInstances,
+    (void *) &xf86GetDevFromEntity,
+    (void *) &xf86RemoveEntityFromScreen,
+    (void *) &xf86GetEntityInfo,
+    (void *) &xf86GetPciInfoForEntity,
+    (void *) &xf86SetEntityFuncs,
+    (void *) &xf86CheckPciMemBase,
+    (void *) &xf86IsEntityPrimary,
+    (void *) &xf86EnterServerState,
+    (void *) &xf86FindScreenForEntity,
+    (void *) &xf86GetLastScrnFlag,
+    (void *) &xf86SetLastScrnFlag,
+    (void *) &xf86IsEntityShared,
+    (void *) &xf86SetEntityShared,
+    (void *) &xf86IsEntitySharable,
+    (void *) &xf86SetEntitySharable,
+    (void *) &xf86IsPrimInitDone,
+    (void *) &xf86SetPrimInitDone,
+    (void *) &xf86ClearPrimInitDone,
+    (void *) &xf86AllocateEntityPrivateIndex,
+    (void *) &xf86GetEntityPrivate,
+    (void *) &xf86AddBusDeviceToConfigure,
+    (void *) &xf86LockZoom,
+    (void *) &xf86InitViewport,
+    (void *) &xf86SetViewport,
+    (void *) &xf86ZoomViewport,
+    (void *) &xf86SwitchMode,
+    (void *) &xf86GetPointerScreenFuncs,
+    (void *) &xf86InitOrigins,
+    (void *) &xf86ReconfigureLayout,
+    (void *) &xf86CVTMode,
+    (void *) &xf86DPMSInit,
+    (void *) &DPMSSet,
+    (void *) &DPMSSupported,
+    (void *) &DGAInit,
+    (void *) &DGAReInitModes,
+    (void *) &xf86SetDGAMode,
+    (void *) &SetTimeSinceLastInputEvent,
+    (void *) &xf86AddInputHandler,
+    (void *) &xf86RemoveInputHandler,
+    (void *) &xf86DisableInputHandler,
+    (void *) &xf86EnableInputHandler,
+    (void *) &xf86AddGeneralHandler,
+    (void *) &xf86RemoveGeneralHandler,
+    (void *) &xf86DisableGeneralHandler,
+    (void *) &xf86EnableGeneralHandler,
+    (void *) &xf86InterceptSignals,
+    (void *) &xf86InterceptSigIll,
+    (void *) &xf86EnableVTSwitch,
+    (void *) &xf86ProcessActionEvent,
+    (void *) &xf86PrintBacktrace,
+    (void *) &xf86AddDriver,
+    (void *) &xf86DeleteDriver,
+    (void *) &xf86AllocateScreen,
+    (void *) &xf86DeleteScreen,
+    (void *) &xf86AllocateScrnInfoPrivateIndex,
+    (void *) &xf86AddPixFormat,
+    (void *) &xf86SetDepthBpp,
+    (void *) &xf86PrintDepthBpp,
+    (void *) &xf86SetWeight,
+    (void *) &xf86SetDefaultVisual,
+    (void *) &xf86SetGamma,
+    (void *) &xf86SetDpi,
+    (void *) &xf86SetBlackWhitePixels,
+    (void *) &xf86EnableDisableFBAccess,
+    (void *) &xf86VDrvMsgVerb,
+    (void *) &xf86DrvMsgVerb,
+    (void *) &xf86DrvMsg,
+    (void *) &xf86MsgVerb,
+    (void *) &xf86Msg,
+    (void *) &xf86ErrorFVerb,
+    (void *) &xf86ErrorF,
+    (void *) &xf86TokenToString,
+    (void *) &xf86StringToToken,
+    (void *) &xf86ShowClocks,
+    (void *) &xf86PrintChipsets,
+    (void *) &xf86MatchDevice,
+    (void *) &xf86MatchPciInstances,
+    (void *) &xf86GetClocks,
+    (void *) &xf86GetVisualName,
+    (void *) &xf86GetVerbosity,
+    (void *) &xf86GetPix24,
+    (void *) &xf86GetDepth,
+    (void *) &xf86GetWeight,
+    (void *) &xf86GetGamma,
+    (void *) &xf86GetFlipPixels,
+    (void *) &xf86GetServerName,
+    (void *) &xf86ServerIsExiting,
+    (void *) &xf86ServerIsResetting,
+    (void *) &xf86ServerIsInitialising,
+    (void *) &xf86ServerIsOnlyDetecting,
+    (void *) &xf86CaughtSignal,
+    (void *) &xf86GetVidModeAllowNonLocal,
+    (void *) &xf86GetVidModeEnabled,
+    (void *) &xf86GetModInDevAllowNonLocal,
+    (void *) &xf86GetModInDevEnabled,
+    (void *) &xf86GetAllowMouseOpenFail,
+    (void *) &xf86IsPc98,
+    (void *) &xf86DisableRandR,
+    (void *) &xorgGetVersion,
+    (void *) &xf86GetModuleVersion,
+    (void *) &xf86LoadDrvSubModule,
+    (void *) &xf86LoadSubModule,
+    (void *) &xf86LoadOneModule,
+    (void *) &xf86UnloadSubModule,
+    (void *) &xf86LoaderCheckSymbol,
+    (void *) &xf86SetBackingStore,
+    (void *) &xf86SetSilkenMouse,
+    (void *) &xf86FindXvOptions,
+    (void *) &xf86GetOS,
+    (void *) &xf86ConfigPciEntity,
+    (void *) &xf86ConfigFbEntity,
+    (void *) &xf86ConfigActivePciEntity,
+    (void *) &xf86IsScreenPrimary,
+    (void *) &xf86RegisterRootWindowProperty,
+    (void *) &xf86IsUnblank,
+    (void *) &xf86GetPixFormat,
+    (void *) &xf86GetBppFromDepth,
+    (void *) &xf86GetNearestClock,
+    (void *) &xf86ModeStatusToString,
+    (void *) &xf86LookupMode,
+    (void *) &xf86CheckModeForMonitor,
+    (void *) &xf86InitialCheckModeForDriver,
+    (void *) &xf86CheckModeForDriver,
+    (void *) &xf86ValidateModes,
+    (void *) &xf86DeleteMode,
+    (void *) &xf86PruneDriverModes,
+    (void *) &xf86SetCrtcForModes,
+    (void *) &xf86PrintModes,
+    (void *) &xf86ShowClockRanges,
+    (void *) &xf86ModeHSync,
+    (void *) &xf86ModeVRefresh,
+    (void *) &xf86SetModeDefaultName,
+    (void *) &xf86SetModeCrtc,
+    (void *) &xf86DuplicateMode,
+    (void *) &xf86DuplicateModes,
+    (void *) &xf86ModesEqual,
+    (void *) &xf86PrintModeline,
+    (void *) &xf86ModesAdd,
+    (void *) &xf86CollectOptions,
+    (void *) &xf86RandRInit,
+    (void *) &xf86GetRotation,
+    (void *) &xf86RandRSetNewVirtualAndDimensions,
+    (void *) &VidModeExtensionInit,
+    (void *) &xf86addNewOption,
+    (void *) &xf86optionListDup,
+    (void *) &xf86optionListFree,
+    (void *) &xf86optionName,
+    (void *) &xf86optionValue,
+    (void *) &xf86newOption,
+    (void *) &xf86nextOption,
+    (void *) &xf86findOption,
+    (void *) &xf86findOptionValue,
+    (void *) &xf86optionListCreate,
+    (void *) &xf86optionListMerge,
+    (void *) &xf86nameCompare,
+    (void *) &xf86uLongToString,
+    (void *) &xf86parseOption,
+    (void *) &xf86printOptionList,
+    (void *) &xf86initConfigFiles,
+    (void *) &xf86openConfigFile,
+    (void *) &xf86openConfigDirFiles,
+    (void *) &xf86setBuiltinConfig,
+    (void *) &xf86readConfigFile,
+    (void *) &xf86closeConfigFile,
+    (void *) &xf86freeConfig,
+    (void *) &xf86writeConfigFile,
+    (void *) &xf86findDevice,
+    (void *) &xf86findLayout,
+    (void *) &xf86findMonitor,
+    (void *) &xf86findModes,
+    (void *) &xf86findModeLine,
+    (void *) &xf86findScreen,
+    (void *) &xf86findInput,
+    (void *) &xf86findInputByDriver,
+    (void *) &xf86findVideoAdaptor,
+    (void *) &xf86layoutAddInputDevices,
+    (void *) &xf86addListItem,
+    (void *) &xf86itemNotSublist,
+    (void *) &xf86pathIsAbsolute,
+    (void *) &xf86pathIsSafe,
+    (void *) &xf86addComment,
+    (void *) &xf86getBoolValue,
+    (void *) &xf86ModeHSync,
+    (void *) &xf86ModeVRefresh,
+    (void *) &xf86ModeBandwidth,
+    (void *) &xf86ModeWidth,
+    (void *) &xf86ModeHeight,
+    (void *) &xf86DuplicateMode,
+    (void *) &xf86DuplicateModes,
+    (void *) &xf86SetModeDefaultName,
+    (void *) &xf86SetModeCrtc,
+    (void *) &xf86ModesEqual,
+    (void *) &xf86PrintModeline,
+    (void *) &xf86ModesAdd,
+    (void *) &xf86DDCGetModes,
+    (void *) &xf86CVTMode,
+    (void *) &xf86GTFMode,
+    (void *) &xf86ModeIsReduced,
+    (void *) &xf86ValidateModesFlags,
+    (void *) &xf86ValidateModesClocks,
+    (void *) &xf86ValidateModesSize,
+    (void *) &xf86ValidateModesSync,
+    (void *) &xf86ValidateModesBandwidth,
+    (void *) &xf86ValidateModesReducedBlanking,
+    (void *) &xf86PruneInvalidModes,
+    (void *) &xf86PruneDuplicateModes,
+    (void *) &xf86ValidateModesFlags,
+    (void *) &xf86ValidateModesUserConfig,
+    (void *) &xf86GetMonitorModes,
+    (void *) &xf86GetDefaultModes,
+    (void *) &xf86DDCApplyQuirks,
+    (void *) &miDCInitialize,
+    (void *) &miPointerInitialize,
+    (void *) &miPointerWarpCursor,
+    (void *) &miPointerCurrentScreen,
+    (void *) &miPointerGetScreen,
+    (void *) &miPointerSetScreen,
+    (void *) &miPointerGetPosition,
+    (void *) &miPointerSetPosition,
+    (void *) &miPointerUpdateSprite,
+    (void *) &miPointerScreenKey,
+    (void *) &xf86InitCursor,
+    (void *) &xf86CreateCursorInfoRec,
+    (void *) &xf86DestroyCursorInfoRec,
+    (void *) &xf86ForceHWCursor,
+    (void *) &xf86CrtcConfigPrivateIndex,
+    (void *) &xf86CrtcConfigInit,
+    (void *) &xf86CrtcSetSizeRange,
+    (void *) &xf86CrtcCreate,
+    (void *) &xf86CrtcDestroy,
+    (void *) &xf86CrtcSetModeTransform,
+    (void *) &xf86CrtcSetMode,
+    (void *) &xf86CrtcSetOrigin,
+    (void *) &xf86CrtcRotate,
+    (void *) &xf86RotateDestroy,
+    (void *) &xf86RotateFreeShadow,
+    (void *) &xf86RotateCloseScreen,
+    (void *) &xf86CrtcInUse,
+    (void *) &xf86OutputCreate,
+    (void *) &xf86OutputUseScreenMonitor,
+    (void *) &xf86OutputRename,
+    (void *) &xf86OutputDestroy,
+    (void *) &xf86ProbeOutputModes,
+    (void *) &xf86SetScrnInfoModes,
+    (void *) &xf86CrtcScreenInit,
+    (void *) &xf86InitialConfiguration,
+    (void *) &xf86DPMSSet,
+    (void *) &xf86SaveScreen,
+    (void *) &xf86DisableUnusedFunctions,
+    (void *) &xf86OutputFindClosestMode,
+    (void *) &xf86SetSingleMode,
+    (void *) &xf86OutputSetEDID,
+    (void *) &xf86OutputGetEDIDModes,
+    (void *) &xf86OutputGetEDID,
+    (void *) &xf86DiDGAInit,
+    (void *) &xf86DiDGAReInit,
+    (void *) &xf86CrtcSetScreenSubpixelOrder,
+    (void *) &xf86ConnectorGetName,
+    (void *) &xf86SetDesiredModes,
+    (void *) &xf86_cursors_init,
+    (void *) &xf86_reload_cursors,
+    (void *) &xf86_show_cursors,
+    (void *) &xf86_hide_cursors,
+    (void *) &xf86_cursors_fini,
+    (void *) &xf86_crtc_clip_video_helper,
+    (void *) &xf86_wrap_crtc_notify,
+    (void *) &xf86_unwrap_crtc_notify,
+    (void *) &xf86_crtc_notify,
+    (void *) &xf86_crtc_supports_gamma,
+    (void *) &xf86RandR12CreateScreenResources,
+    (void *) &xf86RandR12Init,
+    (void *) &xf86RandR12SetRotations,
+    (void *) &xf86RandR12SetTransformSupport,
+    (void *) &xf86RandR12SetConfig,
+    (void *) &xf86RandR12GetRotation,
+    (void *) &xf86RandR12GetOriginalVirtualSize,
+    (void *) &xf86RandR12PreInit,
+    (void *) &xf86RandR12TellChanged,
+    (void *) &xf86DoEDID_DDC1,
+    (void *) &xf86DoEDID_DDC2,
+    (void *) &xf86DoEEDID,
+    (void *) &xf86PrintEDID,
+    (void *) &xf86InterpretEDID,
+    (void *) &xf86InterpretEEDID,
+    (void *) &xf86EdidMonitorSet,
+    (void *) &xf86SetDDCproperties,
+    (void *) &xf86DDCGetModes,
+    (void *) &xf86MonitorIsHDMI,
+    (void *) &xf86DoDisplayID,
+    (void *) &xf86DisplayIDMonitorSet,
+    (void *) &FindDMTMode,
+    (void *) &DMTModes,
+    (void *) &xf86MonitorIsHDMI,
+    (void *) &xf86ConfigFile,
+    (void *) &xf86ConfigDir,
+    (void *) &xf86AllowMouseOpenFail,
+    (void *) &xf86fpFlag,
+    (void *) &xf86sFlag,
+    (void *) &xf86bsEnableFlag,
+    (void *) &xf86bsDisableFlag,
+    (void *) &xf86silkenMouseDisableFlag,
+    (void *) &xf86xkbdirFlag,
+    (void *) &xf86LayoutName,
+    (void *) &xf86ScreenName,
+    (void *) &xf86PointerName,
+    (void *) &xf86KeyboardName,
+    (void *) &xf86FbBpp,
+    (void *) &xf86Depth,
+    (void *) &xf86Pix24,
+    (void *) &xf86Weight,
+    (void *) &xf86FlipPixels,
+    (void *) &xf86Gamma,
+    (void *) &xf86ServerName,
+    (void *) &xf86IsolateDevice,
+    (void *) &xf86Info,
+    (void *) &xf86ModulePath,
+    (void *) &xf86ModPathFrom,
+    (void *) &xf86LogFile,
+    (void *) &xf86LogFileFrom,
+    (void *) &xf86LogFileWasOpened,
+    (void *) &xf86ConfigLayout,
+    (void *) &xf86DriverList,
+    (void *) &xf86NumDrivers,
+    (void *) &xf86Resetting,
+    (void *) &xf86Initialising,
+    (void *) &xf86NumScreens,
+    (void *) &xf86VisualNames,
+    (void *) &xf86Verbose,
+    (void *) &xf86LogVerbose,
+    (void *) &xorgHWAccess,
+    (void *) &xf86RegisteredPropertiesTable,
+    (void *) &xf86BusProbe,
+    (void *) &xf86AccessInit,
+    (void *) &xf86AccessEnter,
+    (void *) &xf86AccessLeave,
+    (void *) &xf86EntityInit,
+    (void *) &xf86FindPrimaryDevice,
+    (void *) &xf86PostProbe,
+    (void *) &xf86ClearEntityListForScreen,
+    (void *) &xf86AddDevToEntity,
+    (void *) &xf86PostScreenInit,
+    (void *) &xf86PathIsSafe,
+    (void *) &xf86DefaultModes,
+    (void *) &xf86NumDefaultModes,
+    (void *) &DoConfigure,
+    (void *) &DoShowOptions,
+    (void *) &xf86Wakeup,
+    (void *) &xf86SigWrapper,
+    (void *) &xf86HandlePMEvents,
+    (void *) &xf86PMGetEventFromOs,
+    (void *) &xf86PMConfirmEventToOs,
+    (void *) &xf86LogInit,
+    (void *) &xf86CloseLog,
+    (void *) &xf86LoadModules,
+    (void *) &xf86SetVerbosity,
+    (void *) &xf86SetLogVerbosity,
+    (void *) &xf86CallDriverProbe,
+    (void *) &xf86Events,
+    (void *) &xf86HandleColormaps,
+    (void *) &xf86ChangeGamma,
+    (void *) &xf86ChangeGammaRamp,
+    (void *) &xf86GetGammaRampSize,
+    (void *) &xf86GetGammaRamp,
+    (void *) &xf86RegisterOffscreenManager,
+    (void *) &xf86InitFBManagerRegion,
+    (void *) &xf86InitFBManagerArea,
+    (void *) &xf86InitFBManager,
+    (void *) &xf86InitFBManagerLinear,
+    (void *) &xf86FBManagerRunning,
+    (void *) &xf86AllocateOffscreenArea,
+    (void *) &xf86AllocateLinearOffscreenArea,
+    (void *) &xf86AllocateOffscreenLinear,
+    (void *) &xf86FreeOffscreenArea,
+    (void *) &xf86FreeOffscreenLinear,
+    (void *) &xf86ResizeOffscreenArea,
+    (void *) &xf86ResizeOffscreenLinear,
+    (void *) &xf86RegisterFreeBoxCallback,
+    (void *) &xf86PurgeUnlockedOffscreenAreas,
+    (void *) &xf86QueryLargestOffscreenArea,
+    (void *) &xf86QueryLargestOffscreenLinear,
+    (void *) &inputInfo,
+    (void *) &CloseInputDevice,
+    (void *) &AddOtherInputDevices,
+    (void *) &OpenInputDevice,
+    (void *) &SetDeviceMode,
+    (void *) &SetDeviceValuators,
+    (void *) &ChangeDeviceControl,
+    (void *) &xf86InputDevs,
+    (void *) &xf86PostMotionEvent,
+    (void *) &xf86PostMotionEventP,
+    (void *) &xf86PostProximityEvent,
+    (void *) &xf86PostProximityEventP,
+    (void *) &xf86PostButtonEvent,
+    (void *) &xf86PostButtonEventP,
+    (void *) &xf86PostKeyEvent,
+    (void *) &xf86PostKeyEventP,
+    (void *) &xf86PostKeyboardEvent,
+    (void *) &xf86ActivateDevice,
+    (void *) &xf86FirstLocalDevice,
+    (void *) &xf86ScaleAxis,
+    (void *) &xf86XInputSetScreen,
+    (void *) &xf86ProcessCommonOptions,
+    (void *) &xf86InitValuatorAxisStruct,
+    (void *) &xf86InitValuatorDefaults,
+    (void *) &xf86AddEnabledDevice,
+    (void *) &xf86RemoveEnabledDevice,
+    (void *) &xf86DisableDevice,
+    (void *) &xf86EnableDevice,
+    (void *) &xf86AddInputDriver,
+    (void *) &xf86DeleteInputDriver,
+    (void *) &xf86AllocateInput,
+    (void *) &xf86LookupInputDriver,
+    (void *) &xf86LookupInput,
+    (void *) &xf86DeleteInput,
+    (void *) &xf86MotionHistoryAllocate,
+    (void *) &xf86CollectInputOptions,
+    (void *) &xf86VGAarbiterInit,
+    (void *) &xf86VGAarbiterFini,
+    (void *) &xf86VGAarbiterWrapFunctions,
+    (void *) &xf86VGAarbiterLock,
+    (void *) &xf86VGAarbiterUnlock,
+    (void *) &xf86VGAarbiterDeviceDecodes,
+    (void *) &xf86VGAarbiterAllowDRI,
+    (void *) &XisbNew,
+    (void *) &XisbFree,
+    (void *) &XisbRead,
+    (void *) &XisbWrite,
+    (void *) &XisbTrace,
+    (void *) &XisbBlockDuration,
+    (void *) &xf86XVScreenInit,
+    (void *) &xf86XVRegisterGenericAdaptorDriver,
+    (void *) &xf86XVListGenericAdaptors,
+    (void *) &xf86XVRegisterOffscreenImages,
+    (void *) &xf86XVQueryOffscreenImages,
+    (void *) &xf86XVAllocateVideoAdaptorRec,
+    (void *) &xf86XVFreeVideoAdaptorRec,
+    (void *) &xf86XVFillKeyHelper,
+    (void *) &xf86XVFillKeyHelperDrawable,
+    (void *) &xf86XVClipVideoHelper,
+    (void *) &xf86XVCopyYUV12ToPacked,
+    (void *) &xf86XVCopyPacked,
+    (void *) &XvGetScreenKeyProc,
+    (void *) &XvGetRTPortProc,
+    (void *) &XvScreenInitProc,
+    (void *) &xf86XvMCScreenInit,
+    (void *) &xf86XvMCCreateAdaptorRec,
+    (void *) &xf86XvMCDestroyAdaptorRec,
+    (void *) &XvMCScreenInitProc,
+    (void *) &XF86XvScreenKey,
+    (void *) &RamDacHWPrivateIndex,
+    (void *) &RamDacScreenPrivateIndex,
+    (void *) &RamDacCreateInfoRec,
+    (void *) &RamDacHelperCreateInfoRec,
+    (void *) &RamDacDestroyInfoRec,
+    (void *) &RamDacHelperDestroyInfoRec,
+    (void *) &RamDacInit,
+    (void *) &RamDacHandleColormaps,
+    (void *) &RamDacFreeRec,
+    (void *) &RamDacGetHWIndex,
+    (void *) &BTramdacProbe,
+    (void *) &BTramdacSave,
+    (void *) &BTramdacRestore,
+    (void *) &BTramdacSetBpp,
+    (void *) &IBMramdacProbe,
+    (void *) &IBMramdacSave,
+    (void *) &IBMramdacRestore,
+    (void *) &IBMramdac526SetBpp,
+    (void *) &IBMramdac640SetBpp,
+    (void *) &IBMramdac526CalculateMNPCForClock,
+    (void *) &IBMramdac640CalculateMNPCForClock,
+    (void *) &IBMramdac526HWCursorInit,
+    (void *) &IBMramdac640HWCursorInit,
+    (void *) &IBMramdac526SetBppWeak,
+    (void *) &TIramdacCalculateMNPForClock,
+    (void *) &TIramdacProbe,
+    (void *) &TIramdacSave,
+    (void *) &TIramdacRestore,
+    (void *) &TIramdac3026SetBpp,
+    (void *) &TIramdac3030SetBpp,
+    (void *) &TIramdacHWCursorInit,
+    (void *) &TIramdacLoadPalette,
+    (void *) &TIramdacLoadPaletteWeak,
+    (void *) &xf86LinearVidMem,
+    (void *) &xf86CheckMTRR,
+    (void *) &xf86MapVidMem,
+    (void *) &xf86UnMapVidMem,
+    (void *) &xf86MapReadSideEffects,
+    (void *) &xf86ReadBIOS,
+    (void *) &xf86EnableIO,
+    (void *) &xf86DisableIO,
+    (void *) &xf86OSRingBell,
+    (void *) &xf86SetReallySlowBcopy,
+    (void *) &xf86SlowBcopy,
+    (void *) &xf86OpenSerial,
+    (void *) &xf86SetSerial,
+    (void *) &xf86SetSerialSpeed,
+    (void *) &xf86ReadSerial,
+    (void *) &xf86WriteSerial,
+    (void *) &xf86CloseSerial,
+    (void *) &xf86FlushInput,
+    (void *) &xf86WaitForInput,
+    (void *) &xf86SerialSendBreak,
+    (void *) &xf86SetSerialModemState,
+    (void *) &xf86GetSerialModemState,
+    (void *) &xf86SerialModemSetBits,
+    (void *) &xf86SerialModemClearBits,
+    (void *) &xf86LoadKernelModule,
+    (void *) &xf86AgpGARTSupported,
+    (void *) &xf86GetAGPInfo,
+    (void *) &xf86AcquireGART,
+    (void *) &xf86ReleaseGART,
+    (void *) &xf86AllocateGARTMemory,
+    (void *) &xf86DeallocateGARTMemory,
+    (void *) &xf86BindGARTMemory,
+    (void *) &xf86UnbindGARTMemory,
+    (void *) &xf86EnableAGP,
+    (void *) &xf86GARTCloseScreen,
+    (void *) &xf86InstallSIGIOHandler,
+    (void *) &xf86RemoveSIGIOHandler,
+    (void *) &xf86BlockSIGIO,
+    (void *) &xf86UnblockSIGIO,
+    (void *) &xf86AssertBlockedSIGIO,
+    (void *) &xf86SIGIOSupported,
+    (void *) &miInitializeBanking,
+    (void *) &miScanLineWidth,
+    (void *) &miInstalledMaps,
+    (void *) &miListInstalledColormaps,
+    (void *) &miInstallColormap,
+    (void *) &miUninstallColormap,
+    (void *) &miResolveColor,
+    (void *) &miInitializeColormap,
+    (void *) &miExpandDirectColors,
+    (void *) &miCreateDefColormap,
+    (void *) &miClearVisualTypes,
+    (void *) &miSetVisualTypes,
+    (void *) &miSetPixmapDepths,
+    (void *) &miSetVisualTypesAndMasks,
+    (void *) &miGetDefaultVisualMask,
+    (void *) &miInitVisuals,
+    (void *) &miSetZeroLineBias,
+    (void *) &miZeroLineScreenKey,
+    (void *) &miZeroClipLine,
+    (void *) &miPolyArc,
+    (void *) &miCopyArea,
+    (void *) &miCopyPlane,
+    (void *) &miGetImage,
+    (void *) &miPutImage,
+    (void *) &miCopyRegion,
+    (void *) &miDoCopy,
+    (void *) &miRecolorCursor,
+    (void *) &miStepDash,
+    (void *) &mieqInit,
+    (void *) &mieqFini,
+    (void *) &mieqEnqueue,
+    (void *) &mieqSwitchScreen,
+    (void *) &mieqProcessDeviceEvent,
+    (void *) &mieqProcessInputEvents,
+    (void *) &CopyGetMasterEvent,
+    (void *) &miHandleExposures,
+    (void *) &miSendGraphicsExpose,
+    (void *) &miSendExposures,
+    (void *) &miWindowExposures,
+    (void *) &miPaintWindow,
+    (void *) &miClearDrawable,
+    (void *) &miPolyFillRect,
+    (void *) &miPolyGlyphBlt,
+    (void *) &miImageGlyphBlt,
+    (void *) &miFillPolygon,
+    (void *) &miFillConvexPoly,
+    (void *) &miFillGeneralPoly,
+    (void *) &miPolyPoint,
+    (void *) &miPolyRectangle,
+    (void *) &miPolySegment,
+    (void *) &miPolyText8,
+    (void *) &miPolyText16,
+    (void *) &miImageText8,
+    (void *) &miImageText16,
+    (void *) &miPushPixels,
+    (void *) &miRectAlloc,
+    (void *) &miRegionBroken,
+    (void *) &miModifyPixmapHeader,
+    (void *) &miCreateScreenResources,
+    (void *) &miScreenDevPrivateInit,
+    (void *) &miScreenInit,
+    (void *) &miAllocateGCPrivateIndex,
+    (void *) &miShapedWindowIn,
+    (void *) &miRegisterRedirectBorderClipProc,
+    (void *) &miValidateTree,
+    (void *) &miWideLine,
+    (void *) &miWideDash,
+    (void *) &miClearToBackground,
+    (void *) &miMarkWindow,
+    (void *) &miMarkOverlappedWindows,
+    (void *) &miHandleValidateExposures,
+    (void *) &miMoveWindow,
+    (void *) &miSlideAndSizeWindow,
+    (void *) &miGetLayerWindow,
+    (void *) &miSetShape,
+    (void *) &miChangeBorderWidth,
+    (void *) &miMarkUnrealizedWindow,
+    (void *) &miSegregateChildren,
+    (void *) &miZeroPolyArc,
+    (void *) &miZeroLine,
+    (void *) &miZeroDashLine,
+    (void *) &miPolyFillArc,
+    (void *) &miInitializeBackingStore,
+    (void *) &miChangeGC,
+    (void *) &miDestroyGC,
+    (void *) &miDestroyClip,
+    (void *) &miChangeClip,
+    (void *) &miCopyClip,
+    (void *) &miCopyGC,
+    (void *) &miComputeCompositeClip,
+    (void *) &miZeroArcSetup,
+    (void *) &miFillArcSetup,
+    (void *) &miFillArcSliceSetup,
+    (void *) &miInitSpanGroup,
+    (void *) &miAppendSpans,
+    (void *) &miFillUniqueSpanGroup,
+    (void *) &miFreeSpanGroup,
+    (void *) &miClipSpans,
+    (void *) &miFillSppPoly,
+    (void *) &miRoundJoinClip,
+    (void *) &miRoundCapClip,
+    (void *) &miPolyBuildEdge,
+    (void *) &miPolyBuildPoly,
+    (void *) &miInitOverlay,
+    (void *) &miOverlayGetPrivateClips,
+    (void *) &miOverlayCollectUnderlayRegions,
+    (void *) &miOverlayComputeCompositeClip,
+    (void *) &miOverlayCopyUnderlay,
+    (void *) &miOverlaySetTransFunction,
+    (void *) &miOverlaySetRootClip,
+    (void *) &RegionResType,
+    (void *) &XFixesErrorBase,
+    (void *) &XFixesRegionCopy,
+    (void *) &config_init,
+    (void *) &config_fini,
+    (void *) &SetCriticalEvent,
+    (void *) &GetSpriteCursor,
+    (void *) &ProcAllowEvents,
+    (void *) &MaybeDeliverEventsToClient,
+    (void *) &ProcWarpPointer,
+    (void *) &EventSelectForWindow,
+    (void *) &EventSuppressForWindow,
+    (void *) &ProcSetInputFocus,
+    (void *) &ProcGetInputFocus,
+    (void *) &ProcGrabPointer,
+    (void *) &ProcChangeActivePointerGrab,
+    (void *) &ProcUngrabPointer,
+    (void *) &ProcGrabKeyboard,
+    (void *) &ProcUngrabKeyboard,
+    (void *) &ProcQueryPointer,
+    (void *) &ProcSendEvent,
+    (void *) &ProcUngrabKey,
+    (void *) &ProcGrabKey,
+    (void *) &ProcGrabButton,
+    (void *) &ProcUngrabButton,
+    (void *) &ProcRecolorCursor,
+    (void *) &PostSyntheticMotion,
+    (void *) &SetDefaultFont,
+    (void *) &QueueFontWakeup,
+    (void *) &RemoveFontWakeup,
+    (void *) &FontWakeup,
+    (void *) &OpenFont,
+    (void *) &CloseFont,
+    (void *) &QueryFont,
+    (void *) &ListFonts,
+    (void *) &doListFontsWithInfo,
+    (void *) &doPolyText,
+    (void *) &PolyText,
+    (void *) &doImageText,
+    (void *) &ImageText,
+    (void *) &SetFontPath,
+    (void *) &SetDefaultFontPath,
+    (void *) &GetFontPath,
+    (void *) &DeleteClientFontStuff,
+    (void *) &InitFonts,
+    (void *) &FreeFonts,
+    (void *) &find_old_font,
+    (void *) &GetGlyphs,
+    (void *) &QueryGlyphExtents,
+    (void *) &QueryTextExtents,
+    (void *) &ParseGlyphCachingMode,
+    (void *) &InitGlyphCaching,
+    (void *) &SetGlyphCachingMode,
+    (void *) &BuiltinRegisterFpeFunctions,
+    (void *) &client_auth_generation,
+    (void *) &DeleteFontClientID,
+    (void *) &GetClientResolutions,
+    (void *) &GetDefaultPointSize,
+    (void *) &GetNewFontClientID,
+    (void *) &init_fs_handlers,
+    (void *) &RegisterFPEFunctions,
+    (void *) &remove_fs_handlers,
+    (void *) &StoreFontClientFont,
+    (void *) &CreateGrab,
+    (void *) &DeletePassiveGrab,
+    (void *) &GrabMatchesSecond,
+    (void *) &AddPassiveGrabToList,
+    (void *) &DeletePassiveGrabFromList,
+    (void *) &InitProximityClassDeviceStruct,
+    (void *) &InitValuatorAxisStruct,
+    (void *) &XIDeleteAllDeviceProperties,
+    (void *) &XIDeleteDeviceProperty,
+    (void *) &XIChangeDeviceProperty,
+    (void *) &XIGetDeviceProperty,
+    (void *) &XISetDevicePropertyDeletable,
+    (void *) &XIRegisterPropertyHandler,
+    (void *) &XIUnregisterPropertyHandler,
+    (void *) &XIGetKnownProperty,
+    (void *) &XIGetDevice,
+    (void *) &XIPropToInt,
+    (void *) &XIPropToFloat,
+    (void *) &RegisterOtherDevice,
+    (void *) &UpdateDeviceState,
+    (void *) &ProcessOtherEvent,
+    (void *) &DeviceFocusEvent,
+    (void *) &CheckGrabValues,
+    (void *) &GrabButton,
+    (void *) &GrabKey,
+    (void *) &GrabWindow,
+    (void *) &SelectForWindow,
+    (void *) &AddExtensionClient,
+    (void *) &RecalculateDeviceDeliverableEvents,
+    (void *) &InputClientGone,
+    (void *) &SendEvent,
+    (void *) &SetButtonMapping,
+    (void *) &ChangeKeyMapping,
+    (void *) &DeleteWindowFromAnyExtEvents,
+    (void *) &MaybeSendDeviceMotionNotifyHint,
+    (void *) &CheckDeviceGrabAndHintWindow,
+    (void *) &MaybeStopDeviceHint,
+    (void *) &DeviceEventSuppressForWindow,
+    (void *) &SendEventToAllWindows,
+    (void *) &XI2EventSwap,
+    (void *) &XIShouldNotify,
+    (void *) &XISendDeviceChangedEvent,
+    (void *) &XISetEventMask,
+    (void *) &XICheckInvalidMaskBits,
+    (void *) &XInputExtensionInit,
+    (void *) &AssignTypeAndName,
+    (void *) &InitVelocityData,
+    (void *) &InitTrackers,
+    (void *) &ProcessVelocityData2D,
+    (void *) &BasicComputeAcceleration,
+    (void *) &FreeVelocityData,
+    (void *) &InitializePredictableAccelerationProperties,
+    (void *) &DeletePredictableAccelerationProperties,
+    (void *) &SetAccelerationProfile,
+    (void *) &GetDevicePredictableAccelData,
+    (void *) &SetDeviceSpecificAccelerationProfile,
+    (void *) &AccelerationDefaultCleanup,
+    (void *) &acceleratePointerPredictable,
+    (void *) &acceleratePointerLightweight,
+    (void *) &RegisterResourceName,
+    (void *) &RegisterExtensionNames,
+    (void *) &LookupMajorName,
+    (void *) &LookupRequestName,
+    (void *) &LookupEventName,
+    (void *) &LookupErrorName,
+    (void *) &LookupResourceName,
+    (void *) &dixResetRegistry,
+    (void *) &dixLookupSelection,
+    (void *) &CurrentSelections,
+    (void *) &SelectionCallback,
+    (void *) &InitSelections,
+    (void *) &DeleteWindowFromAnySelections,
+    (void *) &DeleteClientFromAnySelections,
+    (void *) &Swap32Write,
+    (void *) &CopySwap32Write,
+    (void *) &CopySwap16Write,
+    (void *) &SGenericReply,
+    (void *) &SGetWindowAttributesReply,
+    (void *) &SGetGeometryReply,
+    (void *) &SQueryTreeReply,
+    (void *) &SInternAtomReply,
+    (void *) &SGetAtomNameReply,
+    (void *) &SGetPropertyReply,
+    (void *) &SListPropertiesReply,
+    (void *) &SGetSelectionOwnerReply,
+    (void *) &SQueryPointerReply,
+    (void *) &SwapTimeCoordWrite,
+    (void *) &SGetMotionEventsReply,
+    (void *) &STranslateCoordsReply,
+    (void *) &SGetInputFocusReply,
+    (void *) &SQueryKeymapReply,
+    (void *) &SQueryFontReply,
+    (void *) &SQueryTextExtentsReply,
+    (void *) &SListFontsReply,
+    (void *) &SListFontsWithInfoReply,
+    (void *) &SGetFontPathReply,
+    (void *) &SGetImageReply,
+    (void *) &SListInstalledColormapsReply,
+    (void *) &SAllocColorReply,
+    (void *) &SAllocNamedColorReply,
+    (void *) &SAllocColorCellsReply,
+    (void *) &SAllocColorPlanesReply,
+    (void *) &SQColorsExtend,
+    (void *) &SQueryColorsReply,
+    (void *) &SLookupColorReply,
+    (void *) &SQueryBestSizeReply,
+    (void *) &SListExtensionsReply,
+    (void *) &SGetKeyboardMappingReply,
+    (void *) &SGetPointerMappingReply,
+    (void *) &SGetModifierMappingReply,
+    (void *) &SGetKeyboardControlReply,
+    (void *) &SGetPointerControlReply,
+    (void *) &SGetScreenSaverReply,
+    (void *) &SLHostsExtend,
+    (void *) &SListHostsReply,
+    (void *) &SErrorEvent,
+    (void *) &SwapConnSetupInfo,
+    (void *) &WriteSConnectionInfo,
+    (void *) &SwapConnSetupPrefix,
+    (void *) &WriteSConnSetupPrefix,
+    (void *) &SCirculateEvent,
+    (void *) &SClientMessageEvent,
+    (void *) &SColormapEvent,
+    (void *) &SConfigureNotifyEvent,
+    (void *) &SConfigureRequestEvent,
+    (void *) &SCreateNotifyEvent,
+    (void *) &SDestroyNotifyEvent,
+    (void *) &SEnterLeaveEvent,
+    (void *) &SExposeEvent,
+    (void *) &SFocusEvent,
+    (void *) &SGraphicsExposureEvent,
+    (void *) &SGravityEvent,
+    (void *) &SKeyButtonPtrEvent,
+    (void *) &SKeymapNotifyEvent,
+    (void *) &SMapNotifyEvent,
+    (void *) &SMapRequestEvent,
+    (void *) &SMappingEvent,
+    (void *) &SNoExposureEvent,
+    (void *) &SPropertyEvent,
+    (void *) &SReparentEvent,
+    (void *) &SResizeRequestEvent,
+    (void *) &SSelectionClearEvent,
+    (void *) &SSelectionNotifyEvent,
+    (void *) &SSelectionRequestEvent,
+    (void *) &SUnmapNotifyEvent,
+    (void *) &SVisibilityEvent,
+    (void *) &SwapColorItem,
+    (void *) &SwapConnClientPrefix,
+    (void *) &SProcAllocColor,
+    (void *) &SProcAllocColorCells,
+    (void *) &SProcAllocColorPlanes,
+    (void *) &SProcAllocNamedColor,
+    (void *) &SProcChangeActivePointerGrab,
+    (void *) &SProcChangeGC,
+    (void *) &SProcChangeHosts,
+    (void *) &SProcChangeKeyboardControl,
+    (void *) &SProcChangeKeyboardMapping,
+    (void *) &SProcChangePointerControl,
+    (void *) &SProcChangeProperty,
+    (void *) &SProcChangeWindowAttributes,
+    (void *) &SProcClearToBackground,
+    (void *) &SProcConfigureWindow,
+    (void *) &SProcConvertSelection,
+    (void *) &SProcCopyArea,
+    (void *) &SProcCopyColormapAndFree,
+    (void *) &SProcCopyGC,
+    (void *) &SProcCopyPlane,
+    (void *) &SProcCreateColormap,
+    (void *) &SProcCreateCursor,
+    (void *) &SProcCreateGC,
+    (void *) &SProcCreateGlyphCursor,
+    (void *) &SProcCreatePixmap,
+    (void *) &SProcCreateWindow,
+    (void *) &SProcDeleteProperty,
+    (void *) &SProcFillPoly,
+    (void *) &SProcFreeColors,
+    (void *) &SProcGetImage,
+    (void *) &SProcGetMotionEvents,
+    (void *) &SProcGetProperty,
+    (void *) &SProcGrabButton,
+    (void *) &SProcGrabKey,
+    (void *) &SProcGrabKeyboard,
+    (void *) &SProcGrabPointer,
+    (void *) &SProcImageText,
+    (void *) &SProcInternAtom,
+    (void *) &SProcListFonts,
+    (void *) &SProcListFontsWithInfo,
+    (void *) &SProcLookupColor,
+    (void *) &SProcNoOperation,
+    (void *) &SProcOpenFont,
+    (void *) &SProcPoly,
+    (void *) &SProcPolyText,
+    (void *) &SProcPutImage,
+    (void *) &SProcQueryBestSize,
+    (void *) &SProcQueryColors,
+    (void *) &SProcQueryExtension,
+    (void *) &SProcRecolorCursor,
+    (void *) &SProcReparentWindow,
+    (void *) &SProcResourceReq,
+    (void *) &SProcRotateProperties,
+    (void *) &SProcSendEvent,
+    (void *) &SProcSetClipRectangles,
+    (void *) &SProcSetDashes,
+    (void *) &SProcSetFontPath,
+    (void *) &SProcSetInputFocus,
+    (void *) &SProcSetScreenSaver,
+    (void *) &SProcSetSelectionOwner,
+    (void *) &SProcSimpleReq,
+    (void *) &SProcStoreColors,
+    (void *) &SProcStoreNamedColor,
+    (void *) &SProcTranslateCoords,
+    (void *) &SProcUngrabButton,
+    (void *) &SProcUngrabKey,
+    (void *) &SProcWarpPointer,
+    (void *) &XaceHooks,
+    (void *) &XaceHook,
+    (void *) &XaceHookDispatch,
+    (void *) &XaceHookPropertyAccess,
+    (void *) &XaceHookSelectionAccess,
+    (void *) &XaceHookAuditEnd,
+    (void *) &XaceGetConnectionNumber,
+    (void *) &XaceIsLocal,
+    (void *) &XaceCensorImage,
+    (void *) &XkbIndentText,
+    (void *) &XkbAtomText,
+    (void *) &XkbKeysymText,
+    (void *) &XkbStringText,
+    (void *) &XkbKeyNameText,
+    (void *) &XkbModIndexText,
+    (void *) &XkbModMaskText,
+    (void *) &XkbVModIndexText,
+    (void *) &XkbVModMaskText,
+    (void *) &XkbConfigText,
+    (void *) &XkbSIMatchText,
+    (void *) &XkbIMWhichStateMaskText,
+    (void *) &XkbControlsMaskText,
+    (void *) &XkbGeomFPText,
+    (void *) &XkbDoodadTypeText,
+    (void *) &XkbActionTypeText,
+    (void *) &XkbActionText,
+    (void *) &XkbBehaviorText,
+    (void *) &_XkbKSCheckCase,
+    (void *) &XkbFindKeycodeByName,
+    (void *) &XkbInternAtom,
+    (void *) &XkbConvertGetByNameComponents,
+    (void *) &XkbNameMatchesPattern,
+    (void *) &XkbWriteXKBKeycodes,
+    (void *) &XkbWriteXKBKeyTypes,
+    (void *) &XkbWriteXKBCompatMap,
+    (void *) &XkbWriteXKBSymbols,
+    (void *) &XkbWriteXKBGeometry,
+    (void *) &XkbWriteXKBKeymapForNames,
+    (void *) &XkmProbe,
+    (void *) &XkmReadFile,
+    (void *) &xkbDevicePrivateKey,
+    (void *) &xkbUnwrapProc,
+    (void *) &XkbReqCode,
+    (void *) &XkbEventBase,
+    (void *) &XkbKeyboardErrorCode,
+    (void *) &XkbBaseDirectory,
+    (void *) &XkbBinDirectory,
+    (void *) &xkbDebugFlags,
+    (void *) &DeviceKeyPress,
+    (void *) &DeviceButtonPress,
+    (void *) &XkbUseMsg,
+    (void *) &XkbProcessArguments,
+    (void *) &XkbSetExtension,
+    (void *) &SrvXkbFreeCompatMap,
+    (void *) &SrvXkbFreeNames,
+    (void *) &_XkbLookupAnyDevice,
+    (void *) &_XkbLookupKeyboard,
+    (void *) &_XkbLookupBellDevice,
+    (void *) &_XkbLookupLedDevice,
+    (void *) &_XkbLookupButtonDevice,
+    (void *) &SrvXkbAllocKeyboard,
+    (void *) &SrvXkbAllocClientMap,
+    (void *) &SrvXkbAllocServerMap,
+    (void *) &SrvXkbFreeClientMap,
+    (void *) &SrvXkbFreeServerMap,
+    (void *) &SrvXkbAllocIndicatorMaps,
+    (void *) &SrvXkbAllocCompatMap,
+    (void *) &SrvXkbAllocNames,
+    (void *) &SrvXkbAllocControls,
+    (void *) &SrvXkbCopyKeyTypes,
+    (void *) &SrvXkbResizeKeyType,
+    (void *) &SrvXkbFreeKeyboard,
+    (void *) &XkbSetActionKeyMods,
+    (void *) &XkbMaskForVMask,
+    (void *) &SrvXkbVirtualModsToReal,
+    (void *) &XkbAdjustGroup,
+    (void *) &SrvXkbResizeKeySyms,
+    (void *) &SrvXkbResizeKeyActions,
+    (void *) &XkbUpdateKeyTypesFromCore,
+    (void *) &XkbUpdateDescActions,
+    (void *) &XkbUpdateActions,
+    (void *) &XkbGetCoreMap,
+    (void *) &XkbApplyMappingChange,
+    (void *) &XkbSetIndicators,
+    (void *) &XkbUpdateIndicators,
+    (void *) &XkbAllocSrvLedInfo,
+    (void *) &XkbCopySrvLedInfo,
+    (void *) &XkbFindSrvLedInfo,
+    (void *) &XkbApplyLedNameChanges,
+    (void *) &XkbApplyLedMapChanges,
+    (void *) &XkbApplyLedStateChanges,
+    (void *) &XkbFlushLedEvents,
+    (void *) &XkbIndicatorsToUpdate,
+    (void *) &XkbComputeDerivedState,
+    (void *) &XkbCheckSecondaryEffects,
+    (void *) &XkbCheckIndicatorMaps,
+    (void *) &XkbStateChangedFlags,
+    (void *) &XkbSendStateNotify,
+    (void *) &XkbSendMapNotify,
+    (void *) &XkbComputeControlsNotify,
+    (void *) &XkbSendControlsNotify,
+    (void *) &XkbSendCompatMapNotify,
+    (void *) &XkbHandleBell,
+    (void *) &XkbSendAccessXNotify,
+    (void *) &XkbSendNamesNotify,
+    (void *) &XkbSendActionMessage,
+    (void *) &XkbSendExtensionDeviceNotify,
+    (void *) &XkbSendNotification,
+    (void *) &XkbProcessKeyboardEvent,
+    (void *) &XkbHandleActions,
+    (void *) &XkbEnableDisableControls,
+    (void *) &AccessXInit,
+    (void *) &AccessXFilterPressEvent,
+    (void *) &AccessXFilterReleaseEvent,
+    (void *) &AccessXCancelRepeatKey,
+    (void *) &AccessXComputeCurveFactor,
+    (void *) &XkbFindClientResource,
+    (void *) &XkbAddClientResource,
+    (void *) &XkbRemoveResourceClient,
+    (void *) &XkbDDXAccessXBeep,
+    (void *) &XkbDDXUsesSoftRepeat,
+    (void *) &XkbDDXKeybdCtrlProc,
+    (void *) &XkbDDXChangeControls,
+    (void *) &XkbDDXUpdateDeviceIndicators,
+    (void *) &XkbDDXFakePointerMotion,
+    (void *) &XkbDDXFakeDeviceButton,
+    (void *) &XkbDDXTerminateServer,
+    (void *) &XkbDDXSwitchScreen,
+    (void *) &XkbDDXPrivate,
+    (void *) &XkbDisableComputedAutoRepeats,
+    (void *) &XkbSetRepeatKeys,
+    (void *) &SrvXkbLatchModifiers,
+    (void *) &SrvXkbLatchGroup,
+    (void *) &XkbClearAllLatchesAndLocks,
+    (void *) &XkbGetRulesDflts,
+    (void *) &XkbFreeRMLVOSet,
+    (void *) &XkbSetRulesDflts,
+    (void *) &XkbDeleteRulesDflts,
+    (void *) &SProcXkbDispatch,
+    (void *) &XkbLookupNamedGeometry,
+    (void *) &_XkbDupString,
+    (void *) &XkbConvertCase,
+    (void *) &SrvXkbChangeKeycodeRange,
+    (void *) &XkbFreeSrvLedInfo,
+    (void *) &XkbFreeInfo,
+    (void *) &SrvXkbChangeTypesOfKey,
+    (void *) &SrvXkbKeyTypesForCoreSymbols,
+    (void *) &SrvXkbApplyCompatMapToKey,
+    (void *) &SrvXkbApplyVirtualModChanges,
+    (void *) &XkbSendNewKeyboardNotify,
+    (void *) &XkbCopyKeymap,
+    (void *) &XkbCopyDeviceKeymap,
+    (void *) &XkbFilterEvents,
+    (void *) &XkbGetEffectiveGroup,
+    (void *) &XkbDDXList,
+    (void *) &XkbDDXLoadKeymapByNames,
+    (void *) &XkbDDXNamesFromRules,
+    (void *) &XkbCompileKeymap,
+};
diff --git a/xorg-server/hw/xfree86/modes/Makefile.in b/xorg-server/hw/xfree86/modes/Makefile.in
index 6eaf6d112..62ce86e1c 100644
--- a/xorg-server/hw/xfree86/modes/Makefile.in
+++ b/xorg-server/hw/xfree86/modes/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -295,8 +295,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -356,6 +359,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/Makefile.in b/xorg-server/hw/xfree86/os-support/Makefile.in
index 47a66b364..fa650625b 100644
--- a/xorg-server/hw/xfree86/os-support/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -326,8 +326,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -387,6 +390,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -579,7 +583,7 @@ uninstall-sdkHEADERS:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -604,7 +608,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
diff --git a/xorg-server/hw/xfree86/os-support/bsd/Makefile.in b/xorg-server/hw/xfree86/os-support/bsd/Makefile.in
index 669bc331e..74bf6456c 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/bsd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -289,8 +289,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -350,6 +353,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/bus/Makefile.in b/xorg-server/hw/xfree86/os-support/bus/Makefile.in
index 2878abab3..baad9df02 100644
--- a/xorg-server/hw/xfree86/os-support/bus/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/bus/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -297,8 +297,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -358,6 +361,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/hurd/Makefile.in b/xorg-server/hw/xfree86/os-support/hurd/Makefile.in
index a6f7737f2..06d32f0ab 100644
--- a/xorg-server/hw/xfree86/os-support/hurd/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/hurd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -265,8 +265,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -326,6 +329,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/linux/Makefile.in b/xorg-server/hw/xfree86/os-support/linux/Makefile.in
index ebb05ccc9..8758a6eea 100644
--- a/xorg-server/hw/xfree86/os-support/linux/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/linux/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -290,8 +290,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -351,6 +354,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/misc/Makefile.in b/xorg-server/hw/xfree86/os-support/misc/Makefile.in
index c8357f212..31c246b36 100644
--- a/xorg-server/hw/xfree86/os-support/misc/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/misc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -263,8 +263,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -324,6 +327,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/sco/Makefile.in b/xorg-server/hw/xfree86/os-support/sco/Makefile.in
index c48b61641..ef97c1e13 100644
--- a/xorg-server/hw/xfree86/os-support/sco/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/sco/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -237,8 +237,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -298,6 +301,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/solaris/Makefile.in b/xorg-server/hw/xfree86/os-support/solaris/Makefile.in
index fa734a054..03946bcb1 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/solaris/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -312,8 +312,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -373,6 +376,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/sysv/Makefile.in b/xorg-server/hw/xfree86/os-support/sysv/Makefile.in
index 735890fe7..a5e8a1bf9 100644
--- a/xorg-server/hw/xfree86/os-support/sysv/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/sysv/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -237,8 +237,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -298,6 +301,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/xorgos.c b/xorg-server/hw/xfree86/os-support/xorgos.c
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/xorg-server/hw/xfree86/os-support/xorgos.c
diff --git a/xorg-server/hw/xfree86/parser/InputClass.c b/xorg-server/hw/xfree86/parser/InputClass.c
index 1c9816012..7fb2866cd 100644
--- a/xorg-server/hw/xfree86/parser/InputClass.c
+++ b/xorg-server/hw/xfree86/parser/InputClass.c
@@ -29,6 +29,8 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+#include "os.h"
 #include "xf86Parser.h"
 #include "xf86tokens.h"
 #include "Configint.h"
@@ -45,6 +47,7 @@ xf86ConfigSymTabRec InputClassTab[] =
     {MATCH_PRODUCT, "matchproduct"},
     {MATCH_VENDOR, "matchvendor"},
     {MATCH_DEVICE_PATH, "matchdevicepath"},
+    {MATCH_TAG, "matchtag"},
     {MATCH_IS_KEYBOARD, "matchiskeyboard"},
     {MATCH_IS_POINTER, "matchispointer"},
     {MATCH_IS_JOYSTICK, "matchisjoystick"},
@@ -56,6 +59,8 @@ xf86ConfigSymTabRec InputClassTab[] =
 
 #define CLEANUP xf86freeInputClassList
 
+#define TOKEN_SEP "|"
+
 XF86ConfInputClassPtr
 xf86parseInputClassSection(void)
 {
@@ -91,17 +96,22 @@ xf86parseInputClassSection(void)
         case MATCH_PRODUCT:
             if (xf86getSubToken(&(ptr->comment)) != STRING)
                 Error(QUOTE_MSG, "MatchProduct");
-            ptr->match_product = val.str;
+            ptr->match_product = xstrtokenize(val.str, TOKEN_SEP);
             break;
         case MATCH_VENDOR:
             if (xf86getSubToken(&(ptr->comment)) != STRING)
                 Error(QUOTE_MSG, "MatchVendor");
-            ptr->match_vendor = val.str;
+            ptr->match_vendor = xstrtokenize(val.str, TOKEN_SEP);
             break;
         case MATCH_DEVICE_PATH:
             if (xf86getSubToken(&(ptr->comment)) != STRING)
                 Error(QUOTE_MSG, "MatchDevicePath");
-            ptr->match_device = val.str;
+            ptr->match_device = xstrtokenize(val.str, TOKEN_SEP);
+            break;
+        case MATCH_TAG:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchTag");
+            ptr->match_tag = xstrtokenize(val.str, TOKEN_SEP);
             break;
         case MATCH_IS_KEYBOARD:
             if (xf86getSubToken(&(ptr->comment)) != STRING)
@@ -173,6 +183,8 @@ xf86parseInputClassSection(void)
 void
 xf86printInputClassSection (FILE * cf, XF86ConfInputClassPtr ptr)
 {
+    char **list;
+
     while (ptr) {
         fprintf(cf, "Section \"InputClass\"\n");
         if (ptr->comment)
@@ -181,12 +193,38 @@ xf86printInputClassSection (FILE * cf, XF86ConfInputClassPtr ptr)
             fprintf(cf, "\tIdentifier      \"%s\"\n", ptr->identifier);
         if (ptr->driver)
             fprintf(cf, "\tDriver          \"%s\"\n", ptr->driver);
-        if (ptr->match_product)
-            fprintf(cf, "\tMatchProduct    \"%s\"\n", ptr->match_product);
-        if (ptr->match_vendor)
-            fprintf(cf, "\tMatchVendor     \"%s\"\n", ptr->match_vendor);
-        if (ptr->match_device)
-            fprintf(cf, "\tMatchDevicePath \"%s\"\n", ptr->match_device);
+        if (ptr->match_product) {
+            fprintf(cf, "\tMatchProduct    \"");
+            for (list = ptr->match_product; *list; list++)
+                fprintf(cf, "%s%s",
+                        list == ptr->match_product ? "" : TOKEN_SEP,
+                        *list);
+            fprintf(cf, "\"\n");
+        }
+        if (ptr->match_vendor) {
+            fprintf(cf, "\tMatchVendor     \"");
+            for (list = ptr->match_vendor; *list; list++)
+                fprintf(cf, "%s%s",
+                        list == ptr->match_vendor ? "" : TOKEN_SEP,
+                        *list);
+            fprintf(cf, "\"\n");
+        }
+        if (ptr->match_device) {
+            fprintf(cf, "\tMatchDevicePath \"");
+            for (list = ptr->match_device; *list; list++)
+                fprintf(cf, "%s%s",
+                        list == ptr->match_device ? "" : TOKEN_SEP,
+                        *list);
+            fprintf(cf, "\"\n");
+        }
+        if (ptr->match_tag) {
+            fprintf(cf, "\tMatchTag \"");
+            for (list = ptr->match_tag; *list; list++)
+                fprintf(cf, "%s%s",
+                        list == ptr->match_tag ? "" : TOKEN_SEP,
+                        *list);
+            fprintf(cf, "\"\n");
+        }
         if (ptr->is_keyboard.set)
             fprintf(cf, "\tIsKeyboard      \"%s\"\n",
                     ptr->is_keyboard.val ? "yes" : "no");
@@ -215,13 +253,31 @@ void
 xf86freeInputClassList (XF86ConfInputClassPtr ptr)
 {
     XF86ConfInputClassPtr prev;
+    char **list;
 
     while (ptr) {
         TestFree(ptr->identifier);
         TestFree(ptr->driver);
-        TestFree(ptr->match_product);
-        TestFree(ptr->match_vendor);
-        TestFree(ptr->match_device);
+        if (ptr->match_product) {
+            for (list = ptr->match_product; *list; list++)
+                free(*list);
+            free(ptr->match_product);
+        }
+        if (ptr->match_vendor) {
+            for (list = ptr->match_vendor; *list; list++)
+                free(*list);
+            free(ptr->match_vendor);
+        }
+        if (ptr->match_device) {
+            for (list = ptr->match_device; *list; list++)
+                free(*list);
+            free(ptr->match_device);
+        }
+        if (ptr->match_tag) {
+            for (list = ptr->match_tag; *list; list++)
+                free(*list);
+            free(ptr->match_tag);
+        }
         TestFree(ptr->comment);
         xf86optionListFree(ptr->option_lst);
 
diff --git a/xorg-server/hw/xfree86/parser/Makefile.in b/xorg-server/hw/xfree86/parser/Makefile.in
index 863513cd9..1b31c622d 100644
--- a/xorg-server/hw/xfree86/parser/Makefile.in
+++ b/xorg-server/hw/xfree86/parser/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -94,6 +94,7 @@ am__objects_1 = libxf86config_a-Device.$(OBJEXT) \
 	libxf86config_a-Files.$(OBJEXT) \
 	libxf86config_a-Flags.$(OBJEXT) \
 	libxf86config_a-Input.$(OBJEXT) \
+	libxf86config_a-InputClass.$(OBJEXT) \
 	libxf86config_a-Layout.$(OBJEXT) \
 	libxf86config_a-Module.$(OBJEXT) \
 	libxf86config_a-Video.$(OBJEXT) \
@@ -108,9 +109,9 @@ am_libxf86config_a_OBJECTS = $(am__objects_1)
 libxf86config_a_OBJECTS = $(am_libxf86config_a_OBJECTS)
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libxf86config_internal_la_LIBADD =
-am__objects_2 = Device.lo Files.lo Flags.lo Input.lo Layout.lo \
-	Module.lo Video.lo Monitor.lo Pointer.lo Screen.lo Vendor.lo \
-	read.lo scan.lo write.lo DRI.lo Extensions.lo
+am__objects_2 = Device.lo Files.lo Flags.lo Input.lo InputClass.lo \
+	Layout.lo Module.lo Video.lo Monitor.lo Pointer.lo Screen.lo \
+	Vendor.lo read.lo scan.lo write.lo DRI.lo Extensions.lo
 am_libxf86config_internal_la_OBJECTS = $(am__objects_2)
 libxf86config_internal_la_OBJECTS =  \
 	$(am_libxf86config_internal_la_OBJECTS)
@@ -320,8 +321,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -381,6 +385,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -456,6 +461,7 @@ INTERNAL_SOURCES = \
 	Files.c \
 	Flags.c \
 	Input.c \
+	InputClass.c \
 	Layout.c \
 	Module.c \
 	Video.c \
@@ -582,6 +588,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Files.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Flags.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Input.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InputClass.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Layout.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Module.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Monitor.Plo@am__quote@
@@ -595,6 +602,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxf86config_a-Files.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxf86config_a-Flags.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxf86config_a-Input.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxf86config_a-InputClass.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxf86config_a-Layout.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxf86config_a-Module.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxf86config_a-Monitor.Po@am__quote@
@@ -697,6 +705,22 @@ libxf86config_a-Input.obj: Input.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxf86config_a_CFLAGS) $(CFLAGS) -c -o libxf86config_a-Input.obj `if test -f 'Input.c'; then $(CYGPATH_W) 'Input.c'; else $(CYGPATH_W) '$(srcdir)/Input.c'; fi`
 
+libxf86config_a-InputClass.o: InputClass.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxf86config_a_CFLAGS) $(CFLAGS) -MT libxf86config_a-InputClass.o -MD -MP -MF $(DEPDIR)/libxf86config_a-InputClass.Tpo -c -o libxf86config_a-InputClass.o `test -f 'InputClass.c' || echo '$(srcdir)/'`InputClass.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libxf86config_a-InputClass.Tpo $(DEPDIR)/libxf86config_a-InputClass.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='InputClass.c' object='libxf86config_a-InputClass.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxf86config_a_CFLAGS) $(CFLAGS) -c -o libxf86config_a-InputClass.o `test -f 'InputClass.c' || echo '$(srcdir)/'`InputClass.c
+
+libxf86config_a-InputClass.obj: InputClass.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxf86config_a_CFLAGS) $(CFLAGS) -MT libxf86config_a-InputClass.obj -MD -MP -MF $(DEPDIR)/libxf86config_a-InputClass.Tpo -c -o libxf86config_a-InputClass.obj `if test -f 'InputClass.c'; then $(CYGPATH_W) 'InputClass.c'; else $(CYGPATH_W) '$(srcdir)/InputClass.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libxf86config_a-InputClass.Tpo $(DEPDIR)/libxf86config_a-InputClass.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='InputClass.c' object='libxf86config_a-InputClass.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxf86config_a_CFLAGS) $(CFLAGS) -c -o libxf86config_a-InputClass.obj `if test -f 'InputClass.c'; then $(CYGPATH_W) 'InputClass.c'; else $(CYGPATH_W) '$(srcdir)/InputClass.c'; fi`
+
 libxf86config_a-Layout.o: Layout.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxf86config_a_CFLAGS) $(CFLAGS) -MT libxf86config_a-Layout.o -MD -MP -MF $(DEPDIR)/libxf86config_a-Layout.Tpo -c -o libxf86config_a-Layout.o `test -f 'Layout.c' || echo '$(srcdir)/'`Layout.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libxf86config_a-Layout.Tpo $(DEPDIR)/libxf86config_a-Layout.Po
diff --git a/xorg-server/hw/xfree86/parser/scan.c b/xorg-server/hw/xfree86/parser/scan.c
index b80fbfb8f..03cbc8a44 100644
--- a/xorg-server/hw/xfree86/parser/scan.c
+++ b/xorg-server/hw/xfree86/parser/scan.c
@@ -227,13 +227,15 @@ xf86getNextLine(void)
 			    configFiles[curFileIndex].file);
 
 		if (!ret) {
-			/* stop if there are no more files */
-			if (++curFileIndex >= numFiles) {
-				curFileIndex = 0;
+			/*
+			 * if the file doesn't end in a newline, add one
+			 * and trigger another read
+			 */
+			if (pos != 0) {
+				strcpy(&configBuf[pos], "\n");
+				ret = configBuf;
+			} else
 				break;
-			}
-			configLineNo = 0;
-			continue;
 		}
 
 		/* search for EOL in the new block of chars */
@@ -338,7 +340,17 @@ again:
 			}
 			if (ret == NULL)
 			{
-				return (pushToken = EOF_TOKEN);
+				/*
+				 * if necessary, move to the next file and
+				 * read the first line
+				 */
+				if (curFileIndex + 1 < numFiles) {
+					curFileIndex++;
+					configLineNo = 0;
+					goto again;
+				}
+				else
+					return (pushToken = EOF_TOKEN);
 			}
 			configLineNo++;
 			configPos = 0;
diff --git a/xorg-server/hw/xfree86/parser/xf86Parser.h b/xorg-server/hw/xfree86/parser/xf86Parser.h
index 5e8351fc4..d79544a20 100644
--- a/xorg-server/hw/xfree86/parser/xf86Parser.h
+++ b/xorg-server/hw/xfree86/parser/xf86Parser.h
@@ -343,9 +343,10 @@ typedef struct
 	GenericListRec list;
 	char *identifier;
 	char *driver;
-	char *match_product;
-	char *match_vendor;
-	char *match_device;
+	char **match_product;
+	char **match_vendor;
+	char **match_device;
+	char **match_tag;
 	xf86TriState is_keyboard;
 	xf86TriState is_pointer;
 	xf86TriState is_joystick;
diff --git a/xorg-server/hw/xfree86/parser/xf86tokens.h b/xorg-server/hw/xfree86/parser/xf86tokens.h
index e3a9d716b..cb600704b 100644
--- a/xorg-server/hw/xfree86/parser/xf86tokens.h
+++ b/xorg-server/hw/xfree86/parser/xf86tokens.h
@@ -279,6 +279,7 @@ typedef enum {
     MATCH_PRODUCT,
     MATCH_VENDOR,
     MATCH_DEVICE_PATH,
+    MATCH_TAG,
     MATCH_IS_KEYBOARD,
     MATCH_IS_POINTER,
     MATCH_IS_JOYSTICK,
diff --git a/xorg-server/hw/xfree86/ramdac/Makefile.in b/xorg-server/hw/xfree86/ramdac/Makefile.in
index e0cb15999..a1b5a3c37 100644
--- a/xorg-server/hw/xfree86/ramdac/Makefile.in
+++ b/xorg-server/hw/xfree86/ramdac/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -289,8 +289,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -350,6 +353,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/ramdac/xf86BitOrder.c b/xorg-server/hw/xfree86/ramdac/xf86BitOrder.c
new file mode 100644
index 000000000..713934d3b
--- /dev/null
+++ b/xorg-server/hw/xfree86/ramdac/xf86BitOrder.c
@@ -0,0 +1,2 @@
+#define XAAReverseBitOrder xf86ReverseBitOrder
+#include "./../xaa/xaaBitOrder.c"
diff --git a/xorg-server/hw/xfree86/shadowfb/Makefile.in b/xorg-server/hw/xfree86/shadowfb/Makefile.in
index 98a8b2bf7..1bdd31c55 100644
--- a/xorg-server/hw/xfree86/shadowfb/Makefile.in
+++ b/xorg-server/hw/xfree86/shadowfb/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -292,8 +292,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -353,6 +356,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/utils/Makefile.in b/xorg-server/hw/xfree86/utils/Makefile.in
index bb05c69d1..d882aed24 100644
--- a/xorg-server/hw/xfree86/utils/Makefile.in
+++ b/xorg-server/hw/xfree86/utils/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -277,8 +277,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -338,6 +341,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -452,7 +456,7 @@ clean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -477,7 +481,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
diff --git a/xorg-server/hw/xfree86/utils/cvt/Makefile.in b/xorg-server/hw/xfree86/utils/cvt/Makefile.in
index db1561a1d..8a865b245 100644
--- a/xorg-server/hw/xfree86/utils/cvt/Makefile.in
+++ b/xorg-server/hw/xfree86/utils/cvt/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -319,8 +319,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -380,6 +383,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -484,7 +488,9 @@ MANDEFS = \
 	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
 	-D__mandir__=$(mandir) \
 	-D__projectroot__=$(prefix) \
-	-D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+	-D__datadir__=$(datadir) \
+	-D__xconfigfile__=$(__XCONFIGFILE__) \
+	-D__xconfigdir__=$(__XCONFIGDIR__) \
 	-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
 	-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
 	-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) 
diff --git a/xorg-server/hw/xfree86/utils/gtf/Makefile.in b/xorg-server/hw/xfree86/utils/gtf/Makefile.in
index c00987ae4..24fba799b 100644
--- a/xorg-server/hw/xfree86/utils/gtf/Makefile.in
+++ b/xorg-server/hw/xfree86/utils/gtf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -318,8 +318,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -379,6 +382,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -479,7 +483,9 @@ MANDEFS = \
 	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
 	-D__mandir__=$(mandir) \
 	-D__projectroot__=$(prefix) \
-	-D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+	-D__datadir__=$(datadir) \
+	-D__xconfigfile__=$(__XCONFIGFILE__) \
+	-D__xconfigdir__=$(__XCONFIGDIR__) \
 	-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
 	-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
 	-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) 
diff --git a/xorg-server/hw/xfree86/vbe/Makefile.in b/xorg-server/hw/xfree86/vbe/Makefile.in
index edc3da7f6..74c500562 100644
--- a/xorg-server/hw/xfree86/vbe/Makefile.in
+++ b/xorg-server/hw/xfree86/vbe/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -291,8 +291,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -352,6 +355,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/vgahw/Makefile.in b/xorg-server/hw/xfree86/vgahw/Makefile.in
index 017820a80..e6d74eb33 100644
--- a/xorg-server/hw/xfree86/vgahw/Makefile.in
+++ b/xorg-server/hw/xfree86/vgahw/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -291,8 +291,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -352,6 +355,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/x86emu/Makefile.in b/xorg-server/hw/xfree86/x86emu/Makefile.in
index 922746884..b05b1539e 100644
--- a/xorg-server/hw/xfree86/x86emu/Makefile.in
+++ b/xorg-server/hw/xfree86/x86emu/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -265,8 +265,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -326,6 +329,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -399,7 +403,7 @@ libx86emu_la_SOURCES = debug.c \
                       sys.c \
                       x86emu.h
 
-INCLUDES = $(XORG_INCS)
+INCLUDES = 
 AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
 EXTRA_DIST = validate.c \
              x86emu/debug.h \
diff --git a/xorg-server/hw/xfree86/xaa/Makefile.in b/xorg-server/hw/xfree86/xaa/Makefile.in
index 0bc83c6e6..3f628e5dc 100644
--- a/xorg-server/hw/xfree86/xaa/Makefile.in
+++ b/xorg-server/hw/xfree86/xaa/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -311,8 +311,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -372,6 +375,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/xaa/l-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/l-xaaBitmap.c
new file mode 100644
index 000000000..4b20dee13
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/l-xaaBitmap.c
@@ -0,0 +1,2 @@
+#define LSBFIRST
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/l-xaaStipple.c b/xorg-server/hw/xfree86/xaa/l-xaaStipple.c
new file mode 100644
index 000000000..91c52c778
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/l-xaaStipple.c
@@ -0,0 +1,2 @@
+#define LSBFIRST
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/l-xaaTEGlyph.c b/xorg-server/hw/xfree86/xaa/l-xaaTEGlyph.c
new file mode 100644
index 000000000..e58359cd2
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/l-xaaTEGlyph.c
@@ -0,0 +1,2 @@
+#define LSBFIRST
+#include "./xaaTEGlyph.c"
diff --git a/xorg-server/hw/xfree86/xaa/l3-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/l3-xaaBitmap.c
new file mode 100644
index 000000000..0c1fd552d
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/l3-xaaBitmap.c
@@ -0,0 +1,3 @@
+#define LSBFIRST
+#define TRIPLE_BITS
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/l3-xaaStipple.c b/xorg-server/hw/xfree86/xaa/l3-xaaStipple.c
new file mode 100644
index 000000000..9a182c695
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/l3-xaaStipple.c
@@ -0,0 +1,3 @@
+#define LSBFIRST
+#define TRIPLE_BITS
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/lf-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/lf-xaaBitmap.c
new file mode 100644
index 000000000..031407b9c
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/lf-xaaBitmap.c
@@ -0,0 +1,3 @@
+#define LSBFIRST
+#define FIXEDBASE
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/lf-xaaStipple.c b/xorg-server/hw/xfree86/xaa/lf-xaaStipple.c
new file mode 100644
index 000000000..d91265890
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/lf-xaaStipple.c
@@ -0,0 +1,3 @@
+#define LSBFIRST
+#define FIXEDBASE
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/lf-xaaTEGlyph.c b/xorg-server/hw/xfree86/xaa/lf-xaaTEGlyph.c
new file mode 100644
index 000000000..c578603f3
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/lf-xaaTEGlyph.c
@@ -0,0 +1,3 @@
+#define LSBFIRST
+#define FIXEDBASE
+#include "./xaaTEGlyph.c"
diff --git a/xorg-server/hw/xfree86/xaa/lf3-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/lf3-xaaBitmap.c
new file mode 100644
index 000000000..0607a7390
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/lf3-xaaBitmap.c
@@ -0,0 +1,4 @@
+#define LSBFIRST
+#define TRIPLE_BITS
+#define FIXEDBASE
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/lf3-xaaStipple.c b/xorg-server/hw/xfree86/xaa/lf3-xaaStipple.c
new file mode 100644
index 000000000..af1698b99
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/lf3-xaaStipple.c
@@ -0,0 +1,4 @@
+#define LSBFIRST
+#define TRIPLE_BITS
+#define FIXEDBASE
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/m-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/m-xaaBitmap.c
new file mode 100644
index 000000000..d0e3cb33d
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/m-xaaBitmap.c
@@ -0,0 +1,2 @@
+#define MSBFIRST
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/m-xaaStipple.c b/xorg-server/hw/xfree86/xaa/m-xaaStipple.c
new file mode 100644
index 000000000..1ba789918
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/m-xaaStipple.c
@@ -0,0 +1,2 @@
+#define MSBFIRST
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/m-xaaTEGlyph.c b/xorg-server/hw/xfree86/xaa/m-xaaTEGlyph.c
new file mode 100644
index 000000000..521390c32
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/m-xaaTEGlyph.c
@@ -0,0 +1,2 @@
+#define MSBFIRST
+#include "./xaaTEGlyph.c"
diff --git a/xorg-server/hw/xfree86/xaa/m3-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/m3-xaaBitmap.c
new file mode 100644
index 000000000..7b4ce814d
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/m3-xaaBitmap.c
@@ -0,0 +1,3 @@
+#define MSBFIRST
+#define TRIPLE_BITS
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/m3-xaaStipple.c b/xorg-server/hw/xfree86/xaa/m3-xaaStipple.c
new file mode 100644
index 000000000..eb2c83e8d
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/m3-xaaStipple.c
@@ -0,0 +1,3 @@
+#define MSBFIRST
+#define TRIPLE_BITS
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/mf-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/mf-xaaBitmap.c
new file mode 100644
index 000000000..36075e65d
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/mf-xaaBitmap.c
@@ -0,0 +1,3 @@
+#define MSBFIRST
+#define FIXEDBASE
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/mf-xaaStipple.c b/xorg-server/hw/xfree86/xaa/mf-xaaStipple.c
new file mode 100644
index 000000000..41b469c71
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/mf-xaaStipple.c
@@ -0,0 +1,3 @@
+#define MSBFIRST
+#define FIXEDBASE
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/mf-xaaTEGlyph.c b/xorg-server/hw/xfree86/xaa/mf-xaaTEGlyph.c
new file mode 100644
index 000000000..3fd657b4b
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/mf-xaaTEGlyph.c
@@ -0,0 +1,3 @@
+#define MSBFIRST
+#define FIXEDBASE
+#include "./xaaTEGlyph.c"
diff --git a/xorg-server/hw/xfree86/xaa/mf3-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/mf3-xaaBitmap.c
new file mode 100644
index 000000000..630775c52
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/mf3-xaaBitmap.c
@@ -0,0 +1,4 @@
+#define MSBFIRST
+#define TRIPLE_BITS
+#define FIXEDBASE
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/mf3-xaaStipple.c b/xorg-server/hw/xfree86/xaa/mf3-xaaStipple.c
new file mode 100644
index 000000000..c9a86d008
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/mf3-xaaStipple.c
@@ -0,0 +1,4 @@
+#define MSBFIRST
+#define TRIPLE_BITS
+#define FIXEDBASE
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/s-xaaDashLine.c b/xorg-server/hw/xfree86/xaa/s-xaaDashLine.c
new file mode 100644
index 000000000..5ad3deb92
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/s-xaaDashLine.c
@@ -0,0 +1,2 @@
+#define POLYSEGMENT
+#include "./xaaDashLine.c"
diff --git a/xorg-server/hw/xfree86/xaa/s-xaaLine.c b/xorg-server/hw/xfree86/xaa/s-xaaLine.c
new file mode 100644
index 000000000..12a37f419
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/s-xaaLine.c
@@ -0,0 +1,2 @@
+#define POLYSEGMENT
+#include "./xaaLine.c"
diff --git a/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in b/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in
index 6e819377a..237259c90 100644
--- a/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in
+++ b/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -292,8 +292,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -353,6 +356,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/xorg.c b/xorg-server/hw/xfree86/xorg.c
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/xorg-server/hw/xfree86/xorg.c
diff --git a/xorg-server/hw/xnest/Makefile.in b/xorg-server/hw/xnest/Makefile.in
index 10f038c18..5a07e1b2b 100644
--- a/xorg-server/hw/xnest/Makefile.in
+++ b/xorg-server/hw/xnest/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -313,8 +313,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -377,6 +380,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -526,7 +530,9 @@ MANDEFS = \
 	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
 	-D__mandir__=$(mandir) \
 	-D__projectroot__=$(prefix) \
-	-D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+	-D__datadir__=$(datadir) \
+	-D__xconfigfile__=$(__XCONFIGFILE__) \
+	-D__xconfigdir__=$(__XCONFIGDIR__) \
 	-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
 	-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
 	-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) 
diff --git a/xorg-server/hw/xquartz/GL/Makefile.in b/xorg-server/hw/xquartz/GL/Makefile.in
index 21d6ab0c6..9fd961d42 100644
--- a/xorg-server/hw/xquartz/GL/Makefile.in
+++ b/xorg-server/hw/xquartz/GL/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -264,8 +264,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -325,6 +328,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xquartz/GL/glcontextmodes.c b/xorg-server/hw/xquartz/GL/glcontextmodes.c
deleted file mode 100644
index 326c8b235..000000000
--- a/xorg-server/hw/xquartz/GL/glcontextmodes.c
+++ /dev/null
@@ -1,550 +0,0 @@
-/*
- * (C) Copyright IBM Corporation 2003
- * 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, sub
- * license, 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 (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
- * VA LINUX SYSTEM, IBM 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.
- */
-
-/**
- * \file glcontextmodes.c
- * Utility routines for working with \c __GLcontextModes structures.  At
- * some point most or all of these functions will be moved to the Mesa
- * code base.
- *
- * \author Ian Romanick <idr@us.ibm.com>
- */
-
-#if defined(IN_MINI_GLX)
-#include <GL/gl.h>
-#else
-#if defined(HAVE_DIX_CONFIG_H)
-# include <dix-config.h>
-#endif
-#include <X11/X.h>
-#include <GL/glx.h>
-#include "GL/glxint.h"
-#endif
-
-/* Memory macros */
-#if defined(IN_MINI_GLX)
-# include <stdlib.h>
-# include <string.h>
-# define _mesa_malloc(b) malloc(b)
-# define _mesa_free(m) free(m)
-# define _mesa_memset  memset
-#else
-# ifdef XFree86Server
-# include <os.h>
-# include <string.h>
-#  define _mesa_malloc(b) xalloc(b)
-#  define _mesa_free(m)   xfree(m)
-#  define _mesa_memset   memset
-# else
-#  include <X11/Xlibint.h>
-#  define _mesa_memset memset
-#  define _mesa_malloc(b) Xmalloc(b)
-#  define _mesa_free(m) Xfree(m)
-# endif /* XFree86Server */
-#endif /* !defined(IN_MINI_GLX) */
-
-#include "glcontextmodes.h"
-
-#if !defined(IN_MINI_GLX)
-#define NUM_VISUAL_TYPES   6
-
-/**
- * Convert an X visual type to a GLX visual type.
- * 
- * \param visualType X visual type (i.e., \c TrueColor, \c StaticGray, etc.)
- *        to be converted.
- * \return If \c visualType is a valid X visual type, a GLX visual type will
- *         be returned.  Otherwise \c GLX_NONE will be returned.
- */
-GLint
-_gl_convert_from_x_visual_type( int visualType )
-{
-    static const int glx_visual_types[ NUM_VISUAL_TYPES ] = {
-	GLX_STATIC_GRAY,  GLX_GRAY_SCALE,
-	GLX_STATIC_COLOR, GLX_PSEUDO_COLOR,
-	GLX_TRUE_COLOR,   GLX_DIRECT_COLOR
-    };
-
-    return ( (unsigned) visualType < NUM_VISUAL_TYPES )
-	? glx_visual_types[ visualType ] : GLX_NONE;
-}
-
-
-/**
- * Convert a GLX visual type to an X visual type.
- * 
- * \param visualType GLX visual type (i.e., \c GLX_TRUE_COLOR, 
- *                   \c GLX_STATIC_GRAY, etc.) to be converted.
- * \return If \c visualType is a valid GLX visual type, an X visual type will
- *         be returned.  Otherwise -1 will be returned.
- */
-GLint
-_gl_convert_to_x_visual_type( int visualType )
-{
-    static const int x_visual_types[ NUM_VISUAL_TYPES ] = {
-	TrueColor,   DirectColor,
-	PseudoColor, StaticColor,
-	GrayScale,   StaticGray
-    };
-
-    return ( (unsigned) (visualType - GLX_TRUE_COLOR) < NUM_VISUAL_TYPES )
-	? x_visual_types[ visualType - GLX_TRUE_COLOR ] : -1;
-}
-
-
-/**
- * Copy a GLX visual config structure to a GL context mode structure.  All
- * of the fields in \c config are copied to \c mode.  Additional fields in
- * \c mode that can be derrived from the fields of \c config (i.e.,
- * \c haveDepthBuffer) are also filled in.  The remaining fields in \c mode
- * that cannot be derived are set to default values.
- * 
- * \param mode   Destination GL context mode.
- * \param config Source GLX visual config.
- * 
- * \note
- * The \c fbconfigID and \c visualID fields of the \c __GLcontextModes
- * structure will be set to the \c vid of the \c __GLXvisualConfig structure.
- */
-void
-_gl_copy_visual_to_context_mode( __GLcontextModes * mode,
-				 const __GLXvisualConfig * config )
-{
-    __GLcontextModes * const next = mode->next;
-
-    (void) _mesa_memset( mode, 0, sizeof( __GLcontextModes ) );
-    mode->next = next;
-
-    mode->visualID = config->vid;
-    mode->visualType = _gl_convert_from_x_visual_type( config->class );
-    mode->xRenderable = GL_TRUE;
-    mode->fbconfigID = config->vid;
-    mode->drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT;
-
-    mode->rgbMode = (config->rgba != 0);
-    mode->renderType = (mode->rgbMode) ? GLX_RGBA_BIT : GLX_COLOR_INDEX_BIT;
-
-    mode->colorIndexMode = !(mode->rgbMode);
-    mode->doubleBufferMode = (config->doubleBuffer != 0);
-    mode->stereoMode = (config->stereo != 0);
-
-    mode->haveAccumBuffer = ((config->accumRedSize +
-			      config->accumGreenSize +
-			      config->accumBlueSize +
-			      config->accumAlphaSize) > 0);
-    mode->haveDepthBuffer = (config->depthSize > 0);
-    mode->haveStencilBuffer = (config->stencilSize > 0);
-
-    mode->redBits = config->redSize;
-    mode->greenBits = config->greenSize;
-    mode->blueBits = config->blueSize;
-    mode->alphaBits = config->alphaSize;
-    mode->redMask = config->redMask;
-    mode->greenMask = config->greenMask;
-    mode->blueMask = config->blueMask;
-    mode->alphaMask = config->alphaMask;
-    mode->rgbBits = mode->rgbMode ? config->bufferSize : 0;
-    mode->indexBits = mode->colorIndexMode ? config->bufferSize : 0;
-
-    mode->accumRedBits = config->accumRedSize;
-    mode->accumGreenBits = config->accumGreenSize;
-    mode->accumBlueBits = config->accumBlueSize;
-    mode->accumAlphaBits = config->accumAlphaSize;
-    mode->depthBits = config->depthSize;
-    mode->stencilBits = config->stencilSize;
-
-    mode->numAuxBuffers = config->auxBuffers;
-    mode->level = config->level;
-
-    mode->visualRating = config->visualRating;
-    mode->transparentPixel = config->transparentPixel;
-    mode->transparentRed   = config->transparentRed;
-    mode->transparentGreen = config->transparentGreen;
-    mode->transparentBlue  = config->transparentBlue;
-    mode->transparentAlpha = config->transparentAlpha;
-    mode->transparentIndex = config->transparentIndex;
-    mode->samples = config->multiSampleSize;
-    mode->sampleBuffers = config->nMultiSampleBuffers;
-    /* mode->visualSelectGroup = config->visualSelectGroup; ? */
-
-    mode->swapMethod = GLX_SWAP_UNDEFINED_OML;
-
-    mode->bindToTextureRgb = (mode->rgbMode) ? GL_TRUE : GL_FALSE;
-    mode->bindToTextureRgba = (mode->rgbMode && mode->alphaBits) ?
-	GL_TRUE : GL_FALSE;
-    mode->bindToMipmapTexture = mode->rgbMode ? GL_TRUE : GL_FALSE;
-    mode->bindToTextureTargets = mode->rgbMode ?
-	GLX_TEXTURE_1D_BIT_EXT | GLX_TEXTURE_2D_BIT_EXT |
-	GLX_TEXTURE_RECTANGLE_BIT_EXT : 0;
-    mode->yInverted = GL_FALSE;
-}
-
-
-/**
- * Get data from a GL context mode.
- * 
- * \param mode         GL context mode whose data is to be returned.
- * \param attribute    Attribute of \c mode that is to be returned.
- * \param value_return Location to store the data member of \c mode.
- * \return  If \c attribute is a valid attribute of \c mode, zero is
- *          returned.  Otherwise \c GLX_BAD_ATTRIBUTE is returned.
- */
-int
-_gl_get_context_mode_data(const __GLcontextModes *mode, int attribute,
-			  int *value_return)
-{
-    switch (attribute) {
-      case GLX_USE_GL:
-	*value_return = GL_TRUE;
-	return 0;
-      case GLX_BUFFER_SIZE:
-	*value_return = mode->rgbBits;
-	return 0;
-      case GLX_RGBA:
-	*value_return = mode->rgbMode;
-	return 0;
-      case GLX_RED_SIZE:
-	*value_return = mode->redBits;
-	return 0;
-      case GLX_GREEN_SIZE:
-	*value_return = mode->greenBits;
-	return 0;
-      case GLX_BLUE_SIZE:
-	*value_return = mode->blueBits;
-	return 0;
-      case GLX_ALPHA_SIZE:
-	*value_return = mode->alphaBits;
-	return 0;
-      case GLX_DOUBLEBUFFER:
-	*value_return = mode->doubleBufferMode;
-	return 0;
-      case GLX_STEREO:
-	*value_return = mode->stereoMode;
-	return 0;
-      case GLX_AUX_BUFFERS:
-	*value_return = mode->numAuxBuffers;
-	return 0;
-      case GLX_DEPTH_SIZE:
-	*value_return = mode->depthBits;
-	return 0;
-      case GLX_STENCIL_SIZE:
-	*value_return = mode->stencilBits;
-	return 0;
-      case GLX_ACCUM_RED_SIZE:
-	*value_return = mode->accumRedBits;
-	return 0;
-      case GLX_ACCUM_GREEN_SIZE:
-	*value_return = mode->accumGreenBits;
-	return 0;
-      case GLX_ACCUM_BLUE_SIZE:
-	*value_return = mode->accumBlueBits;
-	return 0;
-      case GLX_ACCUM_ALPHA_SIZE:
-	*value_return = mode->accumAlphaBits;
-	return 0;
-      case GLX_LEVEL:
-	*value_return = mode->level;
-	return 0;
-      case GLX_TRANSPARENT_TYPE_EXT:
-	*value_return = mode->transparentPixel;
-	return 0;
-      case GLX_TRANSPARENT_RED_VALUE:
-	*value_return = mode->transparentRed;
-	return 0;
-      case GLX_TRANSPARENT_GREEN_VALUE:
-	*value_return = mode->transparentGreen;
-	return 0;
-      case GLX_TRANSPARENT_BLUE_VALUE:
-	*value_return = mode->transparentBlue;
-	return 0;
-      case GLX_TRANSPARENT_ALPHA_VALUE:
-	*value_return = mode->transparentAlpha;
-	return 0;
-      case GLX_TRANSPARENT_INDEX_VALUE:
-	*value_return = mode->transparentIndex;
-	return 0;
-      case GLX_X_VISUAL_TYPE:
-	*value_return = mode->visualType;
-	return 0;
-      case GLX_CONFIG_CAVEAT:
-	*value_return = mode->visualRating;
-	return 0;
-      case GLX_VISUAL_ID:
-	*value_return = mode->visualID;
-	return 0;
-      case GLX_DRAWABLE_TYPE:
-	*value_return = mode->drawableType;
-	return 0;
-      case GLX_RENDER_TYPE:
-	*value_return = mode->renderType;
-	return 0;
-      case GLX_X_RENDERABLE:
-	*value_return = mode->xRenderable;
-	return 0;
-      case GLX_FBCONFIG_ID:
-	*value_return = mode->fbconfigID;
-	return 0;
-      case GLX_MAX_PBUFFER_WIDTH:
-	*value_return = mode->maxPbufferWidth;
-	return 0;
-      case GLX_MAX_PBUFFER_HEIGHT:
-	*value_return = mode->maxPbufferHeight;
-	return 0;
-      case GLX_MAX_PBUFFER_PIXELS:
-	*value_return = mode->maxPbufferPixels;
-	return 0;
-      case GLX_OPTIMAL_PBUFFER_WIDTH_SGIX:
-	*value_return = mode->optimalPbufferWidth;
-	return 0;
-      case GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX:
-	*value_return = mode->optimalPbufferHeight;
-	return 0;
-      case GLX_SWAP_METHOD_OML:
-	*value_return = mode->swapMethod;
-	return 0;
-      case GLX_SAMPLE_BUFFERS_SGIS:
-	*value_return = mode->sampleBuffers;
-	return 0;
-      case GLX_SAMPLES_SGIS:
-	*value_return = mode->samples;
-	return 0;
-      case GLX_BIND_TO_TEXTURE_RGB_EXT:
-	*value_return = mode->bindToTextureRgb;
-	return 0;
-      case GLX_BIND_TO_TEXTURE_RGBA_EXT:
-	*value_return = mode->bindToTextureRgba;
-	return 0;
-      case GLX_BIND_TO_MIPMAP_TEXTURE_EXT:
-	*value_return = mode->bindToMipmapTexture == GL_TRUE ? GL_TRUE :
-	    GL_FALSE;
-	return 0;
-      case GLX_BIND_TO_TEXTURE_TARGETS_EXT:
-	*value_return = mode->bindToTextureTargets;
-	return 0;
-      case GLX_Y_INVERTED_EXT:
-	*value_return = mode->yInverted;
-	return 0;
-
-      /* Applications are NOT allowed to query GLX_VISUAL_SELECT_GROUP_SGIX.
-       * It is ONLY for communication between the GLX client and the GLX
-       * server.
-       */
-      case GLX_VISUAL_SELECT_GROUP_SGIX:
-      default:
-	return GLX_BAD_ATTRIBUTE;
-    }
-}
-#endif /* !defined(IN_MINI_GLX) */
-
-
-/**
- * Allocate a linked list of \c __GLcontextModes structures.  The fields of
- * each structure will be initialized to "reasonable" default values.  In
- * most cases this is the default value defined by table 3.4 of the GLX
- * 1.3 specification.  This means that most values are either initialized to
- * zero or \c GLX_DONT_CARE (which is -1).  As support for additional
- * extensions is added, the new values will be initialized to appropriate
- * values from the extension specification.
- * 
- * \param count         Number of structures to allocate.
- * \param minimum_size  Minimum size of a structure to allocate.  This allows
- *                      for differences in the version of the
- *                      \c __GLcontextModes stucture used in libGL and in a
- *                      DRI-based driver.
- * \returns A pointer to the first element in a linked list of \c count
- *          stuctures on success, or \c NULL on failure.
- * 
- * \warning Use of \c minimum_size does \b not guarantee binary compatibility.
- *          The fundamental assumption is that if the \c minimum_size
- *          specified by the driver and the size of the \c __GLcontextModes
- *          structure in libGL is the same, then the meaning of each byte in
- *          the structure is the same in both places.  \b Be \b careful!
- *          Basically this means that fields have to be added in libGL and
- *          then propagated to drivers.  Drivers should \b never arbitrarilly
- *          extend the \c __GLcontextModes data-structure.
- */
-__GLcontextModes *
-_gl_context_modes_create( unsigned count, size_t minimum_size )
-{
-   const size_t size = (minimum_size > sizeof( __GLcontextModes ))
-       ? minimum_size : sizeof( __GLcontextModes );
-   __GLcontextModes * base = NULL;
-   __GLcontextModes ** next;
-   unsigned   i;
-
-   next = & base;
-   for ( i = 0 ; i < count ; i++ ) {
-      *next = (__GLcontextModes *) _mesa_malloc( size );
-      if ( *next == NULL ) {
-	 _gl_context_modes_destroy( base );
-	 base = NULL;
-	 break;
-      }
-      
-      (void) _mesa_memset( *next, 0, size );
-      (*next)->visualID = GLX_DONT_CARE;
-      (*next)->visualType = GLX_DONT_CARE;
-      (*next)->visualRating = GLX_NONE;
-      (*next)->transparentPixel = GLX_NONE;
-      (*next)->transparentRed = GLX_DONT_CARE;
-      (*next)->transparentGreen = GLX_DONT_CARE;
-      (*next)->transparentBlue = GLX_DONT_CARE;
-      (*next)->transparentAlpha = GLX_DONT_CARE;
-      (*next)->transparentIndex = GLX_DONT_CARE;
-      (*next)->xRenderable = GLX_DONT_CARE;
-      (*next)->fbconfigID = GLX_DONT_CARE;
-      (*next)->swapMethod = GLX_SWAP_UNDEFINED_OML;
-      (*next)->bindToTextureRgb = GLX_DONT_CARE;
-      (*next)->bindToTextureRgba = GLX_DONT_CARE;
-      (*next)->bindToMipmapTexture = GLX_DONT_CARE;
-      (*next)->bindToTextureTargets = GLX_DONT_CARE;
-      (*next)->yInverted = GLX_DONT_CARE;
-
-      next = & ((*next)->next);
-   }
-
-   return base;
-}
-
-
-/**
- * Destroy a linked list of \c __GLcontextModes structures created by
- * \c _gl_context_modes_create.
- * 
- * \param modes  Linked list of structures to be destroyed.  All structres
- *               in the list will be freed.
- */
-void
-_gl_context_modes_destroy( __GLcontextModes * modes )
-{
-   while ( modes != NULL ) {
-      __GLcontextModes * const next = modes->next;
-
-      _mesa_free( modes );
-      modes = next;
-   }
-}
-
-
-/**
- * Find a context mode matching a Visual ID.
- *
- * \param modes  List list of context-mode structures to be searched.
- * \param vid    Visual ID to be found.
- * \returns A pointer to a context-mode in \c modes if \c vid was found in
- *          the list, or \c NULL if it was not.
- */
-
-__GLcontextModes *
-_gl_context_modes_find_visual(__GLcontextModes *modes, int vid)
-{
-    __GLcontextModes *m;
-
-    for (m = modes; m != NULL; m = m->next)
-	if (m->visualID == vid)
-	    return m;
-
-    return NULL;
-}
-
-__GLcontextModes *
-_gl_context_modes_find_fbconfig(__GLcontextModes *modes, int fbid)
-{
-    __GLcontextModes *m;
-
-    for (m = modes; m != NULL; m = m->next)
-	if (m->fbconfigID == fbid)
-	    return m;
-
-    return NULL;
-}
-
-/**
- * Determine if two context-modes are the same.  This is intended to be used
- * by libGL implementations to compare to sets of driver generated FBconfigs.
- * 
- * \param a  Context-mode to be compared.
- * \param b  Context-mode to be compared.
- * \returns \c GL_TRUE if the two context-modes are the same.  \c GL_FALSE is
- *          returned otherwise.
- */
-GLboolean
-_gl_context_modes_are_same( const __GLcontextModes * a,
-			    const __GLcontextModes * b )
-{
-    return( (a->rgbMode == b->rgbMode) &&
-	    (a->floatMode == b->floatMode) &&
-	    (a->colorIndexMode == b->colorIndexMode) &&
-	    (a->doubleBufferMode == b->doubleBufferMode) &&
-	    (a->stereoMode == b->stereoMode) &&
-	    (a->redBits == b->redBits) &&
-	    (a->greenBits == b->greenBits) &&
-	    (a->blueBits == b->blueBits) &&
-	    (a->alphaBits == b->alphaBits) &&
-#if 0 /* For some reason these don't get set on the client-side in libGL. */
-	    (a->redMask == b->redMask) &&
-	    (a->greenMask == b->greenMask) &&
-	    (a->blueMask == b->blueMask) &&
-	    (a->alphaMask == b->alphaMask) &&
-#endif
-	    (a->rgbBits == b->rgbBits) &&
-	    (a->indexBits == b->indexBits) &&
-	    (a->accumRedBits == b->accumRedBits) &&
-	    (a->accumGreenBits == b->accumGreenBits) &&
-	    (a->accumBlueBits == b->accumBlueBits) &&
-	    (a->accumAlphaBits == b->accumAlphaBits) &&
-	    (a->depthBits == b->depthBits) &&
-	    (a->stencilBits == b->stencilBits) &&
-	    (a->numAuxBuffers == b->numAuxBuffers) &&
-	    (a->level == b->level) &&
-	    (a->pixmapMode == b->pixmapMode) &&
-	    (a->visualRating == b->visualRating) &&
-
-	    (a->transparentPixel == b->transparentPixel) &&
-
-	    ((a->transparentPixel != GLX_TRANSPARENT_RGB) ||
-	     ((a->transparentRed == b->transparentRed) &&
-	      (a->transparentGreen == b->transparentGreen) &&
-	      (a->transparentBlue == b->transparentBlue) &&
-	      (a->transparentAlpha == b->transparentAlpha))) &&
-
-	    ((a->transparentPixel != GLX_TRANSPARENT_INDEX) || 
-	     (a->transparentIndex == b->transparentIndex)) &&
-
-	    (a->sampleBuffers == b->sampleBuffers) &&
-	    (a->samples == b->samples) &&
-	    ((a->drawableType & b->drawableType) != 0) &&
-	    (a->renderType == b->renderType) &&
-	    (a->maxPbufferWidth == b->maxPbufferWidth) &&
-	    (a->maxPbufferHeight == b->maxPbufferHeight) &&
-	    (a->maxPbufferPixels == b->maxPbufferPixels) &&
-	    (a->optimalPbufferWidth == b->optimalPbufferWidth) &&
-	    (a->optimalPbufferHeight == b->optimalPbufferHeight) &&
-	    (a->swapMethod == b->swapMethod) &&
-	    (a->bindToTextureRgb == b->bindToTextureRgb) &&
-	    (a->bindToTextureRgba == b->bindToTextureRgba) &&
-	    (a->bindToMipmapTexture == b->bindToMipmapTexture) &&
-	    (a->bindToTextureTargets == b->bindToTextureTargets) &&
-	    (a->yInverted == b->yInverted) );
-}
diff --git a/xorg-server/hw/xquartz/GL/glcontextmodes.h b/xorg-server/hw/xquartz/GL/glcontextmodes.h
deleted file mode 100644
index afd09cd7f..000000000
--- a/xorg-server/hw/xquartz/GL/glcontextmodes.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * (C) Copyright IBM Corporation 2003
- * 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, sub
- * license, 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 (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
- * VA LINUX SYSTEM, IBM 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.
- */
-
-/**
- * \file glcontextmodes.h
- * \author Ian Romanick <idr@us.ibm.com>
- */
-
-#ifndef GLCONTEXTMODES_H
-#define GLCONTEXTMODES_H
-
-#include "GL/internal/glcore.h"
-
-#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 /* !defined(IN_MINI_GLX) */
-
-extern __GLcontextModes * _gl_context_modes_create( unsigned count,
-    size_t minimum_size );
-extern void _gl_context_modes_destroy( __GLcontextModes * modes );
-extern  __GLcontextModes *
-    _gl_context_modes_find_visual(__GLcontextModes *modes, int vid);
-extern __GLcontextModes *
-    _gl_context_modes_find_fbconfig(__GLcontextModes *modes, int fbid);
-extern GLboolean _gl_context_modes_are_same( const __GLcontextModes * a,
-    const __GLcontextModes * b );
-
-#endif /* GLCONTEXTMODES_H */
diff --git a/xorg-server/hw/xquartz/Makefile.in b/xorg-server/hw/xquartz/Makefile.in
index 2a9cd6510..22b6a1b43 100644
--- a/xorg-server/hw/xquartz/Makefile.in
+++ b/xorg-server/hw/xquartz/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,8 +317,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -378,6 +381,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -637,7 +641,7 @@ clean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -662,7 +666,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
diff --git a/xorg-server/hw/xquartz/bundle/Makefile.in b/xorg-server/hw/xquartz/bundle/Makefile.in
index 8f4ede405..087331e5a 100644
--- a/xorg-server/hw/xquartz/bundle/Makefile.in
+++ b/xorg-server/hw/xquartz/bundle/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -270,8 +270,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -331,6 +334,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xquartz/doc/Makefile.in b/xorg-server/hw/xquartz/doc/Makefile.in
index 691c42267..d253509c7 100644
--- a/xorg-server/hw/xquartz/doc/Makefile.in
+++ b/xorg-server/hw/xquartz/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -266,8 +266,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -327,6 +330,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -426,7 +430,9 @@ MANDEFS = \
 	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
 	-D__mandir__=$(mandir) \
 	-D__projectroot__=$(prefix) \
-	-D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+	-D__datadir__=$(datadir) \
+	-D__xconfigfile__=$(__XCONFIGFILE__) \
+	-D__xconfigdir__=$(__XCONFIGDIR__) \
 	-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
 	-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
 	-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) 
diff --git a/xorg-server/hw/xquartz/mach-startup/Makefile.in b/xorg-server/hw/xquartz/mach-startup/Makefile.in
index 8d6b1fa54..799c5e626 100644
--- a/xorg-server/hw/xquartz/mach-startup/Makefile.in
+++ b/xorg-server/hw/xquartz/mach-startup/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -301,8 +301,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -362,6 +365,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xquartz/pbproxy/Makefile.in b/xorg-server/hw/xquartz/pbproxy/Makefile.in
index 30d254a8f..093fdf1b7 100644
--- a/xorg-server/hw/xquartz/pbproxy/Makefile.in
+++ b/xorg-server/hw/xquartz/pbproxy/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -292,8 +292,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -353,6 +356,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xquartz/xpr/Makefile.in b/xorg-server/hw/xquartz/xpr/Makefile.in
index 830613d82..484898d77 100644
--- a/xorg-server/hw/xquartz/xpr/Makefile.in
+++ b/xorg-server/hw/xquartz/xpr/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -265,8 +265,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -326,6 +329,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index ecd7a9bc9..8520e2375 100644
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -762,6 +762,29 @@ OsVendorInit (void)
 static void

 winUseMsg (void)

 {

+  ErrorF("\n");

+  ErrorF("\n");

+  ErrorF(EXECUTABLE_NAME " Device Dependent Usage:\n");

+  ErrorF("\n");

+

+#ifdef XWIN_CLIPBOARD

+  ErrorF ("-[no]clipboard\n"

+	  "\tEnable [disable] the clipboard integration. Default is enabled.\n");

+#endif

+

+  ErrorF ("-clipupdates num_boxes\n"

+	  "\tUse a clipping region to constrain shadow update blits to\n"

+	  "\tthe updated region when num_boxes, or more, are in the\n"

+	  "\tupdated region.\n");

+

+#ifdef XWIN_XF86CONFIG

+  ErrorF ("-config\n"

+          "\tSpecify a configuration file.\n");

+

+  ErrorF ("-configdir\n"

+          "\tSpecify a configuration directory.\n");

+#endif

+

   ErrorF ("-depth bits_per_pixel\n"

 	  "\tSpecify an optional bitdepth to use in fullscreen mode\n"

 	  "\twith a DirectDraw engine.\n");

@@ -770,6 +793,15 @@ winUseMsg (void)
 	  "\tEmulate 3 button mouse with an optional timeout in\n"

 	  "\tmilliseconds.\n");

 

+#ifdef XWIN_EMULATEPSEUDO

+  ErrorF ("-emulatepseudo\n"

+	  "\tCreate a depth 8 PseudoColor visual when running in\n"

+	  "\tdepths 15, 16, 24, or 32, collectively known as TrueColor\n"

+	  "\tdepths.  The PseudoColor visual does not have correct colors,\n"

+	  "\tand it may crash, but it at least allows you to run your\n"

+	  "\tapplication in TrueColor modes.\n");

+#endif

+

   ErrorF ("-engine engine_type_id\n"

 	  "\tOverride the server's automatically selected engine type:\n"

 	  "\t\t1 - Shadow GDI\n"

@@ -782,135 +814,121 @@ winUseMsg (void)
 

   ErrorF ("-fullscreen\n"

 	  "\tRun the server in fullscreen mode.\n");

-  

-  ErrorF ("-refresh rate_in_Hz\n"

-	  "\tSpecify an optional refresh rate to use in fullscreen mode\n"

-	  "\twith a DirectDraw engine.\n");

 

-  ErrorF ("-screen scr_num [width height [x y] | [[WxH[+X+Y]][@m]] ]\n"

-	  "\tEnable screen scr_num and optionally specify a width and\n"

-	  "\theight and initial position for that screen. Additionally\n"

-	  "\ta monitor number can be specified to start the server on,\n"

-	  "\tat which point, all coordinates become relative to that\n"

-      "\tmonitor (Not for Windows NT4 and 95). Examples:\n"

-      "\t -screen 0 800x600+100+100@2 ; 2nd monitor offset 100,100 size 800x600\n"

-      "\t -screen 0 1024x768@3        ; 3rd monitor size 1024x768\n"

-      "\t -screen 0 @1 ; on 1st monitor using its full resolution (the default)\n");

-

-  ErrorF ("-lesspointer\n"

-	  "\tHide the windows mouse pointer when it is over an inactive\n"

-          "\t" PROJECT_NAME " window.  This prevents ghost cursors appearing where\n"

-	  "\tthe Windows cursor is drawn overtop of the X cursor\n");

-

-  ErrorF ("-nodecoration\n"

-          "\tDo not draw a window border, title bar, etc.  Windowed\n"

-	  "\tmode only.\n");

+  ErrorF ("-ignoreinput\n"

+	  "\tIgnore keyboard and mouse input.\n");

 

 #ifdef XWIN_MULTIWINDOWEXTWM

-  ErrorF ("-mwextwm\n"

-	  "\tRun the server in multi-window external window manager mode.\n");

-

   ErrorF ("-internalwm\n"

 	  "\tRun the internal window manager.\n");

 #endif

 

-  ErrorF ("-rootless\n"

-	  "\tRun the server in rootless mode.\n");

+#ifdef XWIN_XF86CONFIG

+  ErrorF ("-keyboard\n"

+	  "\tSpecify a keyboard device from the configuration file.\n");

+#endif

+

+  ErrorF ("-[no]keyhook\n"

+	  "\tGrab special Windows keypresses like Alt-Tab or the Menu "

+          "key.\n");

+

+  ErrorF ("-lesspointer\n"

+	  "\tHide the windows mouse pointer when it is over any\n"

+          "\t" EXECUTABLE_NAME " window.  This prevents ghost cursors appearing when\n"

+	  "\tthe Windows cursor is drawn on top of the X cursor\n");

+

+  ErrorF ("-logfile filename\n"

+	  "\tWrite log messages to <filename>.\n");

+

+  ErrorF ("-logverbose verbosity\n"

+	  "\tSet the verbosity of log messages. [NOTE: Only a few messages\n"

+	  "\trespect the settings yet]\n"

+	  "\t\t0 - only print fatal error.\n"

+	  "\t\t1 - print additional configuration information.\n"

+	  "\t\t2 - print additional runtime information [default].\n"

+	  "\t\t3 - print debugging and tracing information.\n");

+

+  ErrorF ("-[no]multimonitors or -[no]multiplemonitors\n"

+	  "\tUse the entire virtual screen if multiple\n"

+	  "\tmonitors are present.\n");

 

 #ifdef XWIN_MULTIWINDOW

   ErrorF ("-multiwindow\n"

 	  "\tRun the server in multi-window mode.\n");

 #endif

 

-  ErrorF ("-multiplemonitors\n"

-	  "\tEXPERIMENTAL: Use the entire virtual screen if multiple\n"

-	  "\tmonitors are present.\n");

+#ifdef XWIN_MULTIWINDOWEXTWM

+  ErrorF ("-mwextwm\n"

+	  "\tRun the server in multi-window external window manager mode.\n");

+#endif

 

-#ifdef XWIN_CLIPBOARD

-  ErrorF ("-[no]clipboard\n"

-	  "\tEnable [disable] the clipboard integration. Default is enabled.\n");

+  ErrorF ("-nodecoration\n"

+          "\tDo not draw a window border, title bar, etc.  Windowed\n"

+	  "\tmode only.\n");

 

+#ifdef XWIN_CLIPBOARD

   ErrorF ("-nounicodeclipboard\n"

-	  "\tDo not use Unicode clipboard even if NT-based platform.\n");

+	  "\tDo not use Unicode clipboard even if on a NT-based platform.\n");

 #endif

 

+  ErrorF ("-refresh rate_in_Hz\n"

+	  "\tSpecify an optional refresh rate to use in fullscreen mode\n"

+	  "\twith a DirectDraw engine.\n");

+

+  ErrorF ("-rootless\n"

+	  "\tRun the server in rootless mode.\n");

+

+  ErrorF ("-screen scr_num [width height [x y] | [[WxH[+X+Y]][@m]] ]\n"

+	  "\tEnable screen scr_num and optionally specify a width and\n"

+	  "\theight and initial position for that screen. Additionally\n"

+	  "\ta monitor number can be specified to start the server on,\n"

+	  "\tat which point, all coordinates become relative to that\n"

+      "\tmonitor (Not for Windows NT4 and 95). Examples:\n"

+      "\t -screen 0 800x600+100+100@2 ; 2nd monitor offset 100,100 size 800x600\n"

+      "\t -screen 0 1024x768@3        ; 3rd monitor size 1024x768\n"

+      "\t -screen 0 @1 ; on 1st monitor using its full resolution (the default)\n");

+

   ErrorF ("-scrollbars\n"

 	  "\tIn windowed mode, allow screens bigger than the Windows desktop.\n"

 	  "\tMoreover, if the window has decorations, one can now resize\n"

 	  "\tit.\n");

 

+  ErrorF ("-silent-dup-error\n"

+	  "\tIf another instance of " EXECUTABLE_NAME " with the same display number is running\n"

+     "\texit silently and don’t display any error message.\n");

+

+  ErrorF ("-swcursor\n"

+	  "\tDisable the usage of the Windows cursor and use the X11 software\n"

+	  "\tcursor instead.\n");

+

   ErrorF ("-[no]trayicon\n"

           "\tDo not create a tray icon.  Default is to create one\n"

 	  "\ticon per screen.  You can globally disable tray icons with\n"

 	  "\t-notrayicon, then enable it for specific screens with\n"

 	  "\t-trayicon for those screens.\n");

 

-  ErrorF ("-clipupdates num_boxes\n"

-	  "\tUse a clipping region to constrain shadow update blits to\n"

-	  "\tthe updated region when num_boxes, or more, are in the\n"

-	  "\tupdated region.  Currently supported only by `-engine 1'.\n");

-

-#ifdef XWIN_EMULATEPSEUDO

-  ErrorF ("-emulatepseudo\n"

-	  "\tCreate a depth 8 PseudoColor visual when running in\n"

-	  "\tdepths 15, 16, 24, or 32, collectively known as TrueColor\n"

-	  "\tdepths.  The PseudoColor visual does not have correct colors,\n"

-	  "\tand it may crash, but it at least allows you to run your\n"

-	  "\tapplication in TrueColor modes.\n");

-#endif

-

   ErrorF ("-[no]unixkill\n"

           "\tCtrl+Alt+Backspace exits the X Server.\n");

 

   ErrorF ("-[no]winkill\n"

           "\tAlt+F4 exits the X Server.\n");

 

-#ifdef XWIN_XF86CONFIG

-  ErrorF ("-config\n"

-          "\tSpecify a configuration file.\n");

-

-  ErrorF ("-configdir\n"

-          "\tSpecify a configuration directory.\n");

-

-  ErrorF ("-keyboard\n"

-	  "\tSpecify a keyboard device from the configuration file.\n");

-#endif

-

-  ErrorF ("-xkbrules XKBRules\n"

-	  "\tEquivalent to XKBRules in XF86Config files.\n");

-

-  ErrorF ("-xkbmodel XKBModel\n"

-	  "\tEquivalent to XKBModel in XF86Config files.\n");

-

   ErrorF ("-xkblayout XKBLayout\n"

 	  "\tEquivalent to XKBLayout in XF86Config files.\n"

 	  "\tFor example: -xkblayout de\n");

 

-  ErrorF ("-xkbvariant XKBVariant\n"

-	  "\tEquivalent to XKBVariant in XF86Config files.\n"

-	  "\tFor example: -xkbvariant nodeadkeys\n");

+  ErrorF ("-xkbmodel XKBModel\n"

+	  "\tEquivalent to XKBModel in XF86Config files.\n");

 

   ErrorF ("-xkboptions XKBOptions\n"

 	  "\tEquivalent to XKBOptions in XF86Config files.\n");

 

-  ErrorF ("-logfile filename\n"

-	  "\tWrite logmessages to <filename>.\n");

-

-  ErrorF ("-logverbose verbosity\n"

-	  "\tSet the verbosity of logmessages. [NOTE: Only a few messages\n"

-	  "\trespect the settings yet]\n"

-	  "\t\t0 - only print fatal error.\n"

-	  "\t\t1 - print additional configuration information.\n"

-	  "\t\t2 - print additional runtime information [default].\n"

-	  "\t\t3 - print debugging and tracing information.\n");

-

-  ErrorF ("-[no]keyhook\n"

-	  "\tGrab special windows key combinations like Alt-Tab or the Menu "

-          "key.\n These keys are discarded by default.\n");

+  ErrorF ("-xkbrules XKBRules\n"

+	  "\tEquivalent to XKBRules in XF86Config files.\n");

 

-  ErrorF ("-swcursor\n"

-	  "\tDisable the usage of the windows cursor and use the X11 software "

-	  "cursor instead\n");

+  ErrorF ("-xkbvariant XKBVariant\n"

+	  "\tEquivalent to XKBVariant in XF86Config files.\n"

+	  "\tFor example: -xkbvariant nodeadkeys\n");

 

 #ifdef XWIN_GLX_WINDOWS

   ErrorF ("-[no]wgl\n"

diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am
index f460f7abe..8b6b6a06d 100644
--- a/xorg-server/hw/xwin/Makefile.am
+++ b/xorg-server/hw/xwin/Makefile.am
@@ -153,7 +153,7 @@ XWin_LDADD = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(
 XWin_LDFLAGS = -mwindows
 
 .rc.o:
-	$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include -DPROJECT_NAME=\"$(VENDOR_NAME_SHORT)\"
+	$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include
 
 winprefsyacc.h: winprefsyacc.c
 winprefslex.c: winprefslex.l winprefsyacc.c winprefsyacc.h
@@ -186,11 +186,13 @@ XWinrc.$(FILE_MAN_SUFFIX): XWinrc.man
 
 EXTRAMANDEFS = -D__logdir__=$(logdir) -D__sysconfdir__=$(sysconfdir) -D__datadir__=$(datadir)
 
+xwinconfigdir = $(sysconfdir)/X11
+xwinconfig_DATA = system.XWinrc
+
 include $(top_srcdir)/cpprules.in
 
 EXTRA_DIST = \
 	$(MAN_SRCS) \
-	_usr_X11R6_lib_X11_system.XWinrc \
 	X.ico \
 	XWin.rc \
 	xlaunch/config.cc \
diff --git a/xorg-server/hw/xwin/Makefile.in b/xorg-server/hw/xwin/Makefile.in
index af96f7508..1d7fb3b20 100644
--- a/xorg-server/hw/xwin/Makefile.in
+++ b/xorg-server/hw/xwin/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -64,7 +64,7 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
-	"$(DESTDIR)$(filemandir)"
+	"$(DESTDIR)$(filemandir)" "$(DESTDIR)$(xwinconfigdir)"
 PROGRAMS = $(bin_PROGRAMS)
 am__XWin_SOURCES_DIST = InitInput.c InitOutput.c winallpriv.c \
 	winauth.c winblock.c wincmap.c winconfig.c wincreatewnd.c \
@@ -202,7 +202,7 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-DATA = $(appman_DATA) $(fileman_DATA)
+DATA = $(appman_DATA) $(fileman_DATA) $(xwinconfig_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -388,8 +388,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -449,6 +452,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -654,6 +658,8 @@ appman_DATA = XWin.$(APP_MAN_SUFFIX)
 filemandir = $(FILE_MAN_DIR)
 fileman_DATA = XWinrc.$(FILE_MAN_SUFFIX)
 EXTRAMANDEFS = -D__logdir__=$(logdir) -D__sysconfdir__=$(sysconfdir) -D__datadir__=$(datadir)
+xwinconfigdir = $(sysconfdir)/X11
+xwinconfig_DATA = system.XWinrc
 SUFFIXES = .pre .man .man.pre
 
 # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
@@ -685,7 +691,9 @@ MANDEFS = \
 	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
 	-D__mandir__=$(mandir) \
 	-D__projectroot__=$(prefix) \
-	-D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+	-D__datadir__=$(datadir) \
+	-D__xconfigfile__=$(__XCONFIGFILE__) \
+	-D__xconfigdir__=$(__XCONFIGDIR__) \
 	-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
 	-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
 	-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) 
@@ -693,7 +701,6 @@ MANDEFS = \
 EXTRA_DIST = \
 	$(GLX_EXTRAS) \
 	$(MAN_SRCS) \
-	_usr_X11R6_lib_X11_system.XWinrc \
 	X.ico \
 	XWin.rc \
 	xlaunch/config.cc \
@@ -1012,6 +1019,26 @@ uninstall-filemanDATA:
 	test -n "$$files" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(filemandir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(filemandir)" && rm -f $$files
+install-xwinconfigDATA: $(xwinconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(xwinconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(xwinconfigdir)"
+	@list='$(xwinconfig_DATA)'; test -n "$(xwinconfigdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xwinconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(xwinconfigdir)" || exit $$?; \
+	done
+
+uninstall-xwinconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(xwinconfig_DATA)'; test -n "$(xwinconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(xwinconfigdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(xwinconfigdir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -1100,7 +1127,7 @@ check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(PROGRAMS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(filemandir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(filemandir)" "$(DESTDIR)$(xwinconfigdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -1156,7 +1183,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-appmanDATA install-filemanDATA
+install-data-am: install-appmanDATA install-filemanDATA \
+	install-xwinconfigDATA
 
 install-dvi: install-dvi-am
 
@@ -1203,7 +1231,7 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
-	uninstall-filemanDATA
+	uninstall-filemanDATA uninstall-xwinconfigDATA
 
 .MAKE: all check install install-am install-strip
 
@@ -1216,16 +1244,17 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
 	install-exec-am install-filemanDATA install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-appmanDATA uninstall-binPROGRAMS \
-	uninstall-filemanDATA
+	install-strip install-xwinconfigDATA installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-appmanDATA \
+	uninstall-binPROGRAMS uninstall-filemanDATA \
+	uninstall-xwinconfigDATA
 
 
 .rc.o:
-	$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -DPROJECT_NAME=\"$(VENDOR_NAME_SHORT)\"
+	$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include
 
 winprefsyacc.h: winprefsyacc.c
 winprefslex.c: winprefslex.l winprefsyacc.c winprefsyacc.h
diff --git a/xorg-server/hw/xwin/XWin.man.pre b/xorg-server/hw/xwin/XWin.man.pre
index 0bad65c60..6b28b51d4 100644
--- a/xorg-server/hw/xwin/XWin.man.pre
+++ b/xorg-server/hw/xwin/XWin.man.pre
@@ -9,83 +9,171 @@ XWin \- X Server for the Cygwin environment on Microsoft Windows
 
 
 .SH DESCRIPTION
-.I XWin is an X Server for the X Window System on the Cygwin environment
+\fIXWin\fP 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:
+\fIXWin\fP can operate in 3 different 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.
+* \fISingle Window\fP: This is the default mode.  Each X screen
+appears as a single \fIWindows\fP window and all X windows are contained
+within this window.
+(In X terminology, the \fIWindows\fP window contains the root window for
+the screen)
 .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.
+way that they appear as normal \fIWindows\fP windows.
+.br
+* \fIRootless\fP: In this mode the X server works in a window
+containing the whole screen but this root window (traditionally covered with an X hatch
+pattern) is hidden from view, so only top-level X windows are seen.
+
+.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:
+
+.SH OPTIONS CONTROLLING WINDOWING MODE
+Only one of these options may be specified.
+.TP 8
+.B (default)
+Windowed or rooted mode.
+Each X screen appears as a single \fIWindows\fP window and all X windows are
+contained within those windows.
+.TP 8
+.B \-multiwindow
+Each top-level X window appears in its own \fIWindows\fP window.
+Also start the integrated \fIWindows\fP-based window manager.
+.TP 8
+.B \-rootless
+Run the server in rootless mode.
+The X server works on a window covering the whole screen but the root window
+is hidden from view.
+.TP 8
+.B \-mwextwm
+Experimental.
+The mode combines \fB\-rootless\fP mode drawing with native \fIWindows\fP
+window frames managed by the experimental external window manager \fIxwinwm\fP.
 .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
+\fBNOTE:\fP \fI-multiwindow\fP mode 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 OPTIONS FOR SPECIFYING X SCREENS
+An X display may be composed of multiple screens.
+The default behaviour is to create a single screen 0 that is roughly the
+size of useful area of the primary monitor (allowing for any window
+decorations and the task-bar).
 
-.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
-__logdir__/XWin.0.log\fP.  This file is mainly for debugging purposes.
+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 \-[no]multimonitors or \-[no]multiplemonitors
+Create a screen 0 that covers all monitors [the primary monitor] on a system with
+multiple monitors.
+This option is currently enabled by default in \fB\-multiwindow\fP mode.
+.TP 8
+.B "\-screen \fIscreen_number\fP [\fIW\fP \fIH\fP [\fIX\fP \fIY\fP] | [[\fIW\fPx\fIH\fP[+\fIX\fP+\fIY\fP]][@\fIM\fP]] ] "
+Create screen number
+.I screen_number
+and optionally specify it's
+.I height,
+.I width
+and
+.I initial position.
+Additionally a
+.I
+monitor number
+(which count from 1) can be specified to place the screen on,
+at which point, all coordinates become relative to that monitor.
+Screen numbers must be contiguous starting from zero and cannot be duplicated.
 
+Examples:
 
-.SH PREFERENCES FILE
-On startup \fIXWin\fP looks for the file \fI$HOME/.XWinrc\fP or, if
-the previous file does not exist, \fI
-__sysconfdir__/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).
+.I "  -screen 0 @1 ; on 1st monitor using its full resolution (the default)"
 
+.I "  -screen 0 800x600+100+100@2 ; on 2nd monitor offset 100,100 size 800x600"
 
-.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:
+.I "  -screen 0 1024x768@3        ; on 3rd monitor size 1024x768"
+
+.SH OPTIONS CONTROLLING THE APPEARANCE OF THE X SCREEN WINDOWS
+These parameters only apply to windowed mode screens i.e. not
+in \fB-multwindow\fP or \fB-rootless\fP mode
+.TP 8
+.B "\-fullscreen"
+The X server window takes the full screen, covering completely the
+\fIWindows\fP desktop.
+.TP 8
+.B \-nodecoration
+Do not give the Cygwin/X window a \fIWindows\fP window border, title bar,
+etc.
+This parameter is ignored when the \fB\-fullscreen\fP parameter is specified.
+.TP 8
+.B \-scrollbars
+In windowed mode, allow screens bigger than the \fIWindows\fP desktop.
+Moreover, if the window has decorations, one can now resize it.
+This parameter is ignored when the \fB\-fullscreen\fP parameter is specified.
+
+
+.SH OPTIONS CONTROLLING WINDOWS INTEGRATION
 .TP 8
 .B \-[no]clipboard
 Enables [disables] the integration between the Cygwin/X clipboard and
-Windows clipboard.  The default is enabled.
+\fIWindows\fP clipboard.  The default is enabled.
+.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 \-[no]keyhook
+Enable [disable] a low-level keyboard hook for catching
+special keypresses like Menu and Alt+Tab and passing them to the X
+Server instead of letting \fIWindows\fP handle them.
+.TP 8
+.B \-lesspointer
+Normally the \fIWindows\fP mouse cursor is hidden when the mouse is
+over an active Cygwin/X window.  This option causes the mouse cursor
+also to be hidden when it is over an inactive Cygwin/X window.  This
+prevents the \fIWindows\fP mouse cursor from being drawn on top of the X
+cursor.
+This parameter has no effect unless \fB-swcursor\fP is also specified.
+.TP 8
+.B \-swcursor
+Disable the usage of the \fIWindows\fP cursor and use the X11 software cursor instead.
+.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 \-nounicodeclipboard
+Do not use Unicode clipboard even if on a NT-based platform.
+.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.
+
+.SH DRAWING ENGINE OPTIONS
 .TP 8
 .B "\-clipupdates \fInum_boxes\fP"
-Specify an optional threshold, above which the boxes in a shadow
+Specify an optional threshold, above which the regions 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
@@ -94,36 +182,24 @@ 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 option probably has limited effect on current \fIWindows\fP versions
+as they already perform GDI batching.
 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
+overrides the server's automatically selected 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.
+- Shadow GDI, 2 - Shadow DirectDraw, and 4 - Shadow DirectDraw Non-Locking.
+Additionally, there are engines with type ids
+8 - Primary DirectDraw (obsolete) and 16 - Native GDI (experimental and barely functional).
+Default behavior is to determine the engine with optimum performance that
+supports the specified depth and window configuration.
+
+.SH FULLSCREEN OPTIONS
 .TP 8
 .B "\-depth \fIdepth\fP"
 Specify the color depth, in bits per pixel, to use when running in
@@ -134,104 +210,37 @@ fullscreen with a DirectDraw engine.  This parameter is ignored if
 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.
+
+.SH MISCELLANEOUS OPTIONS
+See also the normal server options described in the \fIXserver(1)\fP
+manual page
+
 .TP 8
 .B \-help
-Write a help text to the console and to the log file.
+Write a help text listing supported command line options and their description to the console.
 .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
-__logdir__/XWin.0.log\fP to the one indicated by \fIFile_Name\fP.
+.B "\-logfile \fIfilename\fP"
+Change the server log file from the default of \fI
+__logdir__/XWin.n.log\fP,
+where \fIn\fP is the display number of the XWin server, to \fIfilename\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
+reported, for \fIlevel\fP=1 simple information about
+configuration is also given, for \fIlevel\fP=2 (default)
+additional runtime information is recorded
+and for \fIlevel\fP=3 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.
+values will yield a still more detailed debug output.
 .TP 8
 .B \-silent-dup-error
-If another instance of XWin is found running, exit silently and don't display
-the error message.
+If another instance of \fIXWin\fP with the same display number is found running,
+exit silently and don't display any error message.
 .TP 8
 .B "\-xkblayout \fIlayout\fP"
 .TP 8
@@ -251,10 +260,60 @@ in order to load a German layout for a pc105 keyboard one uses
 the options:
 .br
 .I " \-xkblayout de \-xkbmodel pc105"
+
+Alternatively one may use the \fIsetxkbmap\fP program after \fIXWin\fP is
+running.
+
+The default is to select a layout matching your current layout as
+reported by \fIWindows\fP if known, or the default X server layout
+if no matching keyboard layout was found.
+
+.SH UNDOCUMENTED OPTIONS
+These options are undocumented.  Do not use them.
+
+.TP 8
+.B \-emulatepseudo
+Create a depth 8 PseudoColor visual when running in depths 15, 16, 24,
+or 32, collectively known as TrueColor depths.
+Color map manipulation is not supported, so the PseudoColor visual will
+not have the correct colors.
+This option is intended to allow applications which only work with a depth 8
+visual to operate in TrueColor modes.
+.TP 8
+.B \-internalwm
+Run the internal window manager.
+
+.SH LOG FILE
+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
+__logdir__/XWin.0.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
+__sysconfdir__/X11/system.XWinrc\fP.  \fI.XWinrc\fP allows setting
+preferences for the following:
+.br
+* 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
+* To include items in the system menu which is associated with the \fIWindows\fP
+window that \fIXWin -multiwindow\fP produces for each top-level X
+window, in both the generic case and for particular programs.
+.br
+* To change the icon that is associated to the \fIWindows\fP window that
+\fIXWin -multiwindow\fP produces for each top-level X-window.
+.br
+* To change the style that is associated to the \fIWindows\fP window that
+\fXWin I-multiwindow\fP produces for each top-level X window.
 .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.
+The format of the \fI.XWinrc\fP file is given in the man page XWinrc(5).
+
+.SH EXAMPLES
+Need some examples
 
 
 .SH "SEE ALSO"
@@ -268,10 +327,9 @@ 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
+- The \fIXWin\fP software is continuously developing; it is therefore possible 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
+look also at the output of \fIXWin -help\fP in order to
 check the options that are operative.
 
 
@@ -282,6 +340,7 @@ 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.
+Humblet, Harold L Hunt II, Dakshinamurthy Karra, Joe Krahn,
+Paul Loewenstein, Kensuke Matsuzaki,
+Takuma Murakami, Earle F. Philhower III, Benjamin Riefenstahl, Yaakov Selkowitz,
+Suhaib Siddiqi, Jack Tanner, Jon Turney and Nicholas Wourms.
diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc
index 7c21009cb..57e7478b6 100644
--- a/xorg-server/hw/xwin/XWin.rc
+++ b/xorg-server/hw/xwin/XWin.rc
@@ -40,10 +40,10 @@
 /* About */

 ABOUT_BOX DIALOGEX 32, 32, 260, 95

 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP  | DS_CENTERMOUSE

-CAPTION "About VcXsrv"

+CAPTION "About "XVENDORNAMESHORT

 FONT 8, "MS Shell Dlg 2"

 BEGIN

-  CONTROL				IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32

+  CONTROL			IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32

   LTEXT			"VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8

   LTEXT			"http://www.hc-consult.be", IDC_STATIC, 36, 18, 220, 8

   LTEXT			"marc@hc-consult.be", IDC_STATIC, 36, 28, 220, 8

@@ -57,12 +57,12 @@ END
 DEPTH_CHANGE_BOX DIALOGEX	32, 32, 180, 100

 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTERMOUSE

 FONT 8, "MS Shell Dlg 2"

-CAPTION "VcXsrv"

+CAPTION XVENDORNAMESHORT

 BEGIN

   DEFPUSHBUTTON		"Dismiss", IDOK, 66, 80, 50, 14

-  CTEXT			"VcXsrv", IDC_STATIC, 40, 12, 100, 8

+  CTEXT			XVENDORNAMESHORT, IDC_STATIC, 40, 12, 100, 8

   CTEXT			"Disruptive screen configuration change.", IDC_STATIC, 7, 40, 166, 8

-  CTEXT			"Restore previous resolution to use VcXsrv.", IDC_STATIC, 7, 52, 166, 8

+  CTEXT			"Restore previous resolution to use "XVENDORNAMESHORT".", IDC_STATIC, 7, 52, 166, 8

 END

 

 

@@ -71,7 +71,7 @@ END
 EXIT_DIALOG DIALOGEX	32, 32, 180, 78

 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE

 FONT 8, "MS Shell Dlg 2"

-CAPTION "Exit VcXsrv?"

+CAPTION "Exit "XVENDORNAMESHORT"?"

 BEGIN

   PUSHBUTTON "E&xit", IDOK, 55, 56, 30, 14

   DEFPUSHBUTTON "&Cancel", IDCANCEL, 95, 56, 30, 14

@@ -102,3 +102,4 @@ END
  */

 

 IDI_XWIN		ICON	"X.ico"

+/* CREATEPROCESS_MANIFEST_RESOURCE_ID	RT_MANIFEST	"XWin.exe.manifest"*/

diff --git a/xorg-server/hw/xwin/_usr_X11R6_lib_X11_system.XWinrc b/xorg-server/hw/xwin/_usr_X11R6_lib_X11_system.XWinrc
deleted file mode 100644
index a82b6a8bc..000000000
--- a/xorg-server/hw/xwin/_usr_X11R6_lib_X11_system.XWinrc
+++ /dev/null
@@ -1,128 +0,0 @@
-# XWin Server Resource File - EXAMPLE
-# Earle F. Philhower, III
-
-# Place in ~/.XWinrc or in /usr/X11R6/lib/X11/system.XWinrc
-
-# Keywords are case insensitive, comments legal pretty much anywhere
-# you can have an end-of-line
-
-# Comments begin with "#" or "//" and go to the end-of-line
-
-# Paths to commands are **cygwin** based (i.e. /usr/local/bin/xcalc)
-
-# Paths to icons are **WINDOWS** based (i.e. c:\windows\icons)
-
-# Menus are defined as...
-# MENU <name> {
-#	<Menu Text>	EXEC	<command>
-#                               ^^ This command will have any "%display%"
-#                                  string replaced with the proper display
-#                                  variable (i.e. 127.0.0.1:<display>.0)
-#                                  (This should only rarely be needed as
-#                                  the DISPLAY environment variable is also
-#                                  set correctly)
-#  or	<Menu Text>	MENU	<name-of-some-prior-defined-menu>
-#  or	<Menu Text>	ALWAYSONTOP
-#                         ^^ Sets the window to display above all others
-#  or   <Menu Text>	RELOAD
-#                         ^^ Causes ~/.XWinrc or the system.XWinrc file
-#                            to be reloaded and icons and menus regenerated
-#  or	SEPARATOR
-#       ...
-# }
-
-# Set the taskmar menu with
-# ROOTMENU <name-of-some-prior-defined-menu>
-
-# If you want a menu to be applied to all popup window's system menu
-# DEFAULTSYSMENU <name-of-some-prior-defined-menu> <atstart|atend>
-
-# To choose a specific menu for a specific WM_CLASS or WM_NAME use ...
-# SYSMENU {
-#	<class-or-name-of-window> <name-of-prior-defined-menu> <atstart|atend>
-#	...
-# }
-
-# When specifying an ICONFILE in the following commands several different
-# formats are allowed:
-# 1. Name of a regular Windows .ico format file
-#    (ex:  "cygwin.ico", "apple.ico")
-# 2. Name and index into a Windows .DLL
-#    (ex: "c:\windows\system32\shell32.dll,4" gives the default folder icon
-#         "c:\windows\system32\shell32.dll,5" gives the floppy drive icon)
-# 3. Index into XWin.EXE internal ICON resource
-#    (ex: ",101" is the 1st icon inside XWin.exe)
-
-# To define where ICO files live (** Windows path**)
-# ICONDIRECTORY	<windows-path i.e. c:\cygwin\usr\icons>
-# NOTE: If you specify a fully qualified path to an ICON below
-#             (i.e. "c:\xxx" or "d:\xxxx")
-#       this ICONDIRECTORY will not be prepended
-
-# To change the taskbar icon use...
-# TRAYICON       <name-of-windows-ico-file-in-icondirectory>
-
-# To define a replacement for the standard X icon for apps w/o specified icons
-# DEFAULTICON	<name-of-windows-ico-file-in-icondirectory>
-
-# To define substitute icons on a per-window basis use...
-# ICONS {
-#	<class-or-name-of-window> <icon-file-name.ico>
-#	...
-# }
-# In the case where multiple matches occur, the first listed in the ICONS
-# section will be chosen.
-
-# To disable exit confirmation dialog add the line containing SilentExit
-
-# DEBUG <string> prints out the string to the XWin.log file
-
-// Below are just some silly menus to demonstrate writing your
-// own configuration file.
-
-// Make some menus...
-menu apps {
-	xterm	exec	"xterm"
-	"Emacs"	exec	"emacs"
-	notepad	exec	notepad
-	xload	exec	"xload -display %display%"  # Comment
-}
-
-menu root {
-// Comments fit here, too...
-	"Reload .XWinrc"	RELOAD
-	"Applications"	menu	apps
-	SEParATOR
-}
-
-menu aot {
-	Separator
-	"Always on Top"	alwaysontop
-}
-
-menu xtermspecial {
-	"Emacs"		exec	"emacs"
-	"Always on Top"	alwaysontop
-	SepArAtor
-}
-
-RootMenu root
-
-DefaultSysMenu aot atend
-
-SysMenu {
-	"xterm"	xtermspecial atstart
-}
-
-# IconDirectory	"c:\winnt\"
-
-# DefaultIcon	"reinstall.ico"
-
-# Icons {
-# 	"xterm"	"uninstall.ico"
-# }
-
-SilentExit
-
-DEBUG "Done parsing the configuration file..."
-
diff --git a/xorg-server/hw/xwin/winclipboardthread.c b/xorg-server/hw/xwin/winclipboardthread.c
index 80381ac51..e08e7acd0 100644
--- a/xorg-server/hw/xwin/winclipboardthread.c
+++ b/xorg-server/hw/xwin/winclipboardthread.c
@@ -117,8 +117,7 @@ winClipboardProc (void *pvNotUsed)
   /* See if X supports the current locale */

   if (XSupportsLocale () == False)

     {

-      ErrorF ("winClipboardProc - Locale not supported by X.  Exiting.\n");

-      goto thread_errorexit;

+      ErrorF ("winClipboardProc - Warning: Locale not supported by X.\n");

     }

 

   /* Create Windows messaging window */

diff --git a/xorg-server/hw/xwin/wincursor.c b/xorg-server/hw/xwin/wincursor.c
index 32ee560df..a29e90c66 100644
--- a/xorg-server/hw/xwin/wincursor.c
+++ b/xorg-server/hw/xwin/wincursor.c
@@ -187,8 +187,7 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen)
   if (pScreenPriv->cursor.sm_cx < pCursor->bits->width || 
       pScreenPriv->cursor.sm_cy < pCursor->bits->height)
     {
-      ErrorF ("winLoadCursor - Windows requires %dx%d cursor\n"
-	      "\tbut X requires %dx%d\n",
+      ErrorF ("winLoadCursor - Windows requires %dx%d cursor but X requires %dx%d\n",
 	      pScreenPriv->cursor.sm_cx, pScreenPriv->cursor.sm_cy,
 	      pCursor->bits->width, pCursor->bits->height);
     }
diff --git a/xorg-server/hw/xwin/winerror.c b/xorg-server/hw/xwin/winerror.c
index dacee38f5..7cbfd65e2 100644
--- a/xorg-server/hw/xwin/winerror.c
+++ b/xorg-server/hw/xwin/winerror.c
@@ -142,6 +142,7 @@ winMessageBoxF (const char *pszError, UINT uType, ...)
 	"Vendor: %s\n" \
 	"Release: %d.%d.%d.%d (%d)\n" \
 	"Contact: %s\n" \
+	"%s\n\n" \
 	"XWin was started with the following command-line:\n\n" \
 	"%s\n"
 
@@ -149,6 +150,7 @@ winMessageBoxF (const char *pszError, UINT uType, ...)
 	   pszErrorF, VENDOR_STRING,
 		       XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT,
 		       VENDOR_CONTACT,
+		       BUILDERSTRING,
 	   g_pszCommandLine);
   if (!pszMsgBox)
     goto winMessageBoxF_Cleanup;
diff --git a/xorg-server/hw/xwin/winkeybd.c b/xorg-server/hw/xwin/winkeybd.c
index bb180dff2..dd00655e3 100644
--- a/xorg-server/hw/xwin/winkeybd.c
+++ b/xorg-server/hw/xwin/winkeybd.c
@@ -274,6 +274,10 @@ winKeybdProc (DeviceIntPtr pDeviceInt, int iState)
       

     case DEVICE_ON: 

       pDevice->on = TRUE;

+

+      // immediately copy the state of this keyboard device to the VCK

+      // (which otherwise happens lazily after the first keypress)

+      CopyKeyClass(pDeviceInt, inputInfo.keyboard);

       break;

 

     case DEVICE_CLOSE:

diff --git a/xorg-server/hw/xwin/winmultiwindowwindow.c b/xorg-server/hw/xwin/winmultiwindowwindow.c
index 6e5df2b3a..fbde122a1 100644
--- a/xorg-server/hw/xwin/winmultiwindowwindow.c
+++ b/xorg-server/hw/xwin/winmultiwindowwindow.c
@@ -450,6 +450,13 @@ winCreateWindowsWindow (WindowPtr pWin)
   iWidth = pWin->drawable.width;

   iHeight = pWin->drawable.height;

 

+  /* ensure window actually ends up somewhere visible */

+  if (iX > GetSystemMetrics (SM_CXVIRTUALSCREEN))

+    iX = CW_USEDEFAULT;

+

+  if (iY > GetSystemMetrics (SM_CYVIRTUALSCREEN))

+    iY = CW_USEDEFAULT;

+

   if (winMultiWindowGetTransientFor (pWin, &pDaddy))

     {

       if (pDaddy)

diff --git a/xorg-server/hw/xwin/winmultiwindowwm.c b/xorg-server/hw/xwin/winmultiwindowwm.c
index 083590218..c3742b755 100644
--- a/xorg-server/hw/xwin/winmultiwindowwm.c
+++ b/xorg-server/hw/xwin/winmultiwindowwm.c
@@ -187,7 +187,7 @@ static void
 winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg);

 

 static Bool

-CheckAnotherWindowManager (Display *pDisplay, DWORD dwScreen);

+CheckAnotherWindowManager (Display *pDisplay, DWORD dwScreen, Bool fAllowOtherWM);

 

 static void

 winApplyHints (Display *pDisplay, Window iWindow, HWND hWnd, HWND *zstyle);

@@ -396,6 +396,7 @@ GetWindowName (Display *pDisplay, Window iWin, wchar_t **ppName)
  	pszReturnData = (char *) malloc (iLen + 1);

  	pszReturnData[0] = '\0';

  	for (i = 0; i < nNum; i++) strcat (pszReturnData, ppList[i]);

+ 	if (ppList) XFreeStringList (ppList);

    }

    else

    {

@@ -406,9 +407,7 @@ GetWindowName (Display *pDisplay, Window iWin, wchar_t **ppName)
    *ppName = (wchar_t*)malloc(sizeof(wchar_t)*(iLen + 1));

    MultiByteToWideChar (CP_UTF8, 0, pszReturnData, -1, *ppName, iLen);

    XFree (xtpName.value);

-   if (ppList) XFreeStringList (ppList);

    free (pszReturnData);

-

   winDebug ("GetWindowName - Returning\n");

 }

 

@@ -804,9 +803,7 @@ winMultiWindowXMsgProc (void *pArg)
   /* See if X supports the current locale */

   if (XSupportsLocale () == False)

     {

-      ErrorF ("winMultiWindowXMsgProc - Locale not supported by X.  "

-	      "Exiting.\n");

-      pthread_exit (NULL);

+      ErrorF ("winMultiWindowXMsgProc - Warning: locale not supported by X\n");

     }

 

   /* Release the server started mutex */

@@ -879,7 +876,7 @@ winMultiWindowXMsgProc (void *pArg)
 	  "successfully opened the display.\n");

 

   /* Check if another window manager is already running */

-  g_fAnotherWMRunning = CheckAnotherWindowManager (pProcArg->pDisplay, pProcArg->dwScreen);

+  g_fAnotherWMRunning = CheckAnotherWindowManager (pProcArg->pDisplay, pProcArg->dwScreen, pProcArg->pWMInfo->fAllowOtherWM);

 

   if (g_fAnotherWMRunning && !pProcArg->pWMInfo->fAllowOtherWM)

     {

@@ -930,7 +927,7 @@ winMultiWindowXMsgProc (void *pArg)
 

       if (pProcArg->pWMInfo->fAllowOtherWM && !XPending (pProcArg->pDisplay))

 	{

-	  if (CheckAnotherWindowManager (pProcArg->pDisplay, pProcArg->dwScreen))

+	  if (CheckAnotherWindowManager (pProcArg->pDisplay, pProcArg->dwScreen, TRUE))

 	    {

 	      if (!g_fAnotherWMRunning)

 		{

@@ -1179,8 +1176,7 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
   /* See if X supports the current locale */

   if (XSupportsLocale () == False)

     {

-      ErrorF ("winInitMultiWindowWM - Locale not supported by X.  Exiting.\n");

-      pthread_exit (NULL);

+      ErrorF ("winInitMultiWindowWM - Warning: Locale not supported by X.\n");

     }

 

   /* Release the server started mutex */

@@ -1414,7 +1410,7 @@ winRedirectErrorHandler (Display *pDisplay, XErrorEvent *pErr)
  */

 

 static Bool

-CheckAnotherWindowManager (Display *pDisplay, DWORD dwScreen)

+CheckAnotherWindowManager (Display *pDisplay, DWORD dwScreen, Bool fAllowOtherWM)

 {

   /*

     Try to select the events which only one client at a time is allowed to select.

@@ -1429,8 +1425,12 @@ CheckAnotherWindowManager (Display *pDisplay, DWORD dwScreen)
 

   /*

     Side effect: select the events we are actually interested in...

+

+    If other WMs are not allowed, also select one of the events which only one client

+    at a time is allowed to select, so other window managers won't start...

   */

-  XSelectInput(pDisplay, RootWindow (pDisplay, dwScreen), SubstructureNotifyMask);

+  XSelectInput(pDisplay, RootWindow (pDisplay, dwScreen),

+               SubstructureNotifyMask | ( !fAllowOtherWM ? ButtonPressMask : 0));

   XSync (pDisplay, 0);

   return redirectError;

 }

@@ -1451,6 +1451,7 @@ winDeinitMultiWindowWM (void)
 #define HINT_BORDER	(1L<<1)

 #define HINT_SIZEBOX	(1l<<2)

 #define HINT_CAPTION	(1l<<3)

+#define HINT_NOMAXIMIZE (1L<<4)

 /* These two are used on their own */

 #define HINT_MAX	(1L<<0)

 #define HINT_MIN	(1L<<1)

@@ -1532,7 +1533,32 @@ winApplyHints (Display *pDisplay, Window iWindow, HWND hWnd, HWND *zstyle)
     if (pAtom) XFree(pAtom);

   }

 

-  /* Apply Styles, overriding hint settings from above */

+  {

+    XSizeHints *normal_hint = XAllocSizeHints();

+    long supplied;

+    if (normal_hint && (XGetWMNormalHints(pDisplay, iWindow, normal_hint, &supplied) == Success))

+      {

+        if (normal_hint->flags & PMaxSize)

+          {

+            /* Not maximizable if a maximum size is specified */

+            hint |= HINT_NOMAXIMIZE;

+

+            if (normal_hint->flags & PMinSize)

+              {

+                /*

+                  If both minimum size and maximum size are specified and are the same,

+                  don't bother with a resizing frame

+                */

+                if ((normal_hint->min_width == normal_hint->max_width)

+                    && (normal_hint->min_height == normal_hint->max_height))

+                  hint = (hint & ~HINT_SIZEBOX);

+              }

+          }

+      }

+    XFree(normal_hint);

+  }

+

+  /* Override hint settings from above with settings from config file */

   style = winOverrideStyle((unsigned long)pWin);

   if (style & STYLE_TOPMOST) *zstyle = HWND_TOPMOST;

   else if (style & STYLE_MAXIMIZE) maxmin = (hint & ~HINT_MIN) | HINT_MAX;

@@ -1549,12 +1575,19 @@ winApplyHints (Display *pDisplay, Window iWindow, HWND hWnd, HWND *zstyle)
   else if (style & STYLE_NOFRAME)

 	hint = (hint & ~HINT_BORDER & ~HINT_CAPTION) | HINT_NOFRAME;

 

+  /* Now apply styles to window */

   style = GetWindowLongPtr(hWnd, GWL_STYLE) & ~WS_CAPTION & ~WS_SIZEBOX; /* Just in case */

   if (!hint) /* All on, but no resize of children is allowed */

     style = style | WS_CAPTION;

-  else if (hint & HINT_NOFRAME); /* All off, so do nothing */

+  else if (hint & HINT_NOFRAME) /* All off */

+    style = style & ~WS_CAPTION & ~WS_SIZEBOX;

   else style = style | ((hint & HINT_BORDER) ? WS_BORDER : 0) |

+		((hint & HINT_SIZEBOX) ? WS_SIZEBOX : 0) |

 		((hint & HINT_CAPTION) ? WS_CAPTION : 0);

+

+  if (hint & HINT_NOMAXIMIZE)

+    style = style & ~WS_MAXIMIZEBOX;

+

                 

   if (winMultiWindowGetWMNormalHints(pWin, &SizeHints))

   {

diff --git a/xorg-server/hw/xwin/winprefslex.l b/xorg-server/hw/xwin/winprefslex.l
index fd3fc1c05..5a443407f 100644
--- a/xorg-server/hw/xwin/winprefslex.l
+++ b/xorg-server/hw/xwin/winprefslex.l
@@ -86,7 +86,7 @@ ATSTART                 { return ATSTART; }
 ATEND                   { return ATEND; }
 EXEC                    { return EXEC; }
 ALWAYSONTOP             { return ALWAYSONTOP; }
-DEBUG                   { return DEBUGTOK; }
+DEBUG                   { return DEBUGOUTPUT; }
 RELOAD                  { return RELOAD; }
 TRAYICON                { return TRAYICON; }
 SILENTEXIT		{ return SILENTEXIT; }
diff --git a/xorg-server/hw/xwin/winprefsyacc.y b/xorg-server/hw/xwin/winprefsyacc.y
index 653a4ab25..b9e961622 100644
--- a/xorg-server/hw/xwin/winprefsyacc.y
+++ b/xorg-server/hw/xwin/winprefsyacc.y
@@ -118,7 +118,7 @@ extern int yylex(void);
 %token ATEND

 %token EXEC

 %token ALWAYSONTOP

-%token DEBUGTOK

+%token DEBUGOUTPUT "DEBUG"

 %token RELOAD

 %token TRAYICON

 %token FORCEEXIT

@@ -246,7 +246,7 @@ forceexit:	FORCEEXIT NEWLINE { pref.fForceExit = TRUE; }
 silentexit:	SILENTEXIT NEWLINE { pref.fSilentExit = TRUE; }

 	;

 

-debug: 	DEBUGTOK STRING NEWLINE { winDebug("LoadPreferences: %s\n", $2); free($2); }

+debug: 	DEBUGOUTPUT STRING NEWLINE { winDebug("LoadPreferences: %s\n", $2); free($2); }

 	;

 

 

diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c
index 0cd9320b9..3cd9353db 100644
--- a/xorg-server/hw/xwin/winprocarg.c
+++ b/xorg-server/hw/xwin/winprocarg.c
@@ -1546,6 +1546,7 @@ winLogVersionInfo (void)
   winDebug ("Welcome to the VcXsrv X Server\n");

   winDebug ("Vendor: %s\n", VENDOR_STRING);

   winDebug ("Release: %d.%d.%d.%d (%d)\n\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT);

+  winDebug ("%s\n\n", BUILDERSTRING);

   winDebug ("Contact: %s\n\n", VENDOR_CONTACT);

 #endif

 }

diff --git a/xorg-server/hw/xwin/winwindow.h b/xorg-server/hw/xwin/winwindow.h
index 9af2c4718..cbe483a93 100644
--- a/xorg-server/hw/xwin/winwindow.h
+++ b/xorg-server/hw/xwin/winwindow.h
@@ -43,6 +43,7 @@
 #ifndef PROJECT_NAME
 #  define PROJECT_NAME		"VcXsrv"
 #endif
+#define EXECUTABLE_NAME         "VcXsrv"
 #define WINDOW_CLASS		"VcXsrv/x"
 #define WINDOW_TITLE		PROJECT_NAME " Server - %s:%s.%d"
 #define WINDOW_TITLE_XDMCP	PROJECT_NAME " Server - %s:%s.%d"