Update to xserver 1.11.2

1 files changed, 141 insertions, 101 deletions

diff --git a/xserver/test/Makefile.in b/xserver/test/Makefile.in
index 3455ff6d0..f3bbdc228 100644
--- a/xserver/test/Makefile.in
+++ b/xserver/test/Makefile.in
@@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -35,14 +36,22 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@UNITTESTS_TRUE@check_PROGRAMS = xkb$(EXEEXT) input$(EXEEXT) \
-@UNITTESTS_TRUE@	xtest$(EXEEXT)
-@SPECIAL_DTRACE_OBJECTS_TRUE@@UNITTESTS_TRUE@am__append_1 = $(OS_LIB) $(DIX_LIB)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@noinst_PROGRAMS =  \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	xkb$(EXEEXT) \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	input$(EXEEXT) \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	xtest$(EXEEXT) \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	list$(EXEEXT) \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	misc$(EXEEXT) \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	fixes$(EXEEXT)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@@SPECIAL_DTRACE_OBJECTS_TRUE@am__append_1 = $(OS_LIB) $(DIX_LIB)
 subdir = test
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
-	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/xorg-tls.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(install_sh) -d
@@ -56,48 +65,50 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
 	$(top_builddir)/include/version-config.h
 CONFIG_CLEAN_FILES =
 am__DEPENDENCIES_1 =
-@UNITTESTS_TRUE@libxservertest_la_DEPENDENCIES =  \
-@UNITTESTS_TRUE@	$(am__DEPENDENCIES_1) \
-@UNITTESTS_TRUE@	$(top_builddir)/hw/xfree86/loader/libloader.la \
-@UNITTESTS_TRUE@	$(top_builddir)/hw/xfree86/os-support/libxorgos.la \
-@UNITTESTS_TRUE@	$(top_builddir)/hw/xfree86/common/libcommon.la \
-@UNITTESTS_TRUE@	$(top_builddir)/hw/xfree86/parser/libxf86config_internal.la \
-@UNITTESTS_TRUE@	$(top_builddir)/hw/xfree86/dixmods/libdixmods.la \
-@UNITTESTS_TRUE@	$(top_builddir)/hw/xfree86/modes/libxf86modes.la \
-@UNITTESTS_TRUE@	$(top_builddir)/hw/xfree86/ramdac/libramdac.la \
-@UNITTESTS_TRUE@	$(top_builddir)/hw/xfree86/ddc/libddc.la \
-@UNITTESTS_TRUE@	$(top_builddir)/hw/xfree86/i2c/libi2c.la \
-@UNITTESTS_TRUE@	$(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
-@UNITTESTS_TRUE@	$(top_builddir)/hw/xfree86/libxorg.la \
-@UNITTESTS_TRUE@	$(top_builddir)/mi/libmi.la \
-@UNITTESTS_TRUE@	$(top_builddir)/os/libos.la
-libxservertest_la_SOURCES = libxservertest.c
-libxservertest_la_OBJECTS = libxservertest.lo
-@UNITTESTS_TRUE@am_libxservertest_la_rpath =
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@nodist_libxservertest_la_OBJECTS =  \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	sdksyms.lo
+libxservertest_la_OBJECTS = $(nodist_libxservertest_la_OBJECTS)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@am_libxservertest_la_rpath =
+PROGRAMS = $(noinst_PROGRAMS)
+fixes_SOURCES = fixes.c
+fixes_OBJECTS = fixes.$(OBJEXT)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@@SPECIAL_DTRACE_OBJECTS_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@@SPECIAL_DTRACE_OBJECTS_TRUE@	$(am__DEPENDENCIES_1)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@am__DEPENDENCIES_3 =  \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	libxservertest.la \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	$(am__DEPENDENCIES_1) \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	$(am__DEPENDENCIES_1) \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	$(am__DEPENDENCIES_2)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@fixes_DEPENDENCIES = $(am__DEPENDENCIES_3)
 input_SOURCES = input.c
 input_OBJECTS = input.$(OBJEXT)
-@SPECIAL_DTRACE_OBJECTS_TRUE@@UNITTESTS_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
-@SPECIAL_DTRACE_OBJECTS_TRUE@@UNITTESTS_TRUE@	$(am__DEPENDENCIES_1)
-@UNITTESTS_TRUE@am__DEPENDENCIES_3 = libxservertest.la \
-@UNITTESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-@UNITTESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
-@UNITTESTS_TRUE@input_DEPENDENCIES = $(am__DEPENDENCIES_3)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@input_DEPENDENCIES = $(am__DEPENDENCIES_3)
+list_SOURCES = list.c
+list_OBJECTS = list.$(OBJEXT)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@list_DEPENDENCIES = $(am__DEPENDENCIES_3)
+misc_SOURCES = misc.c
+misc_OBJECTS = misc.$(OBJEXT)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@misc_DEPENDENCIES = $(am__DEPENDENCIES_3)
 xkb_SOURCES = xkb.c
 xkb_OBJECTS = xkb.$(OBJEXT)
-@UNITTESTS_TRUE@xkb_DEPENDENCIES = $(am__DEPENDENCIES_3)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@xkb_DEPENDENCIES = $(am__DEPENDENCIES_3)
 xtest_SOURCES = xtest.c
 xtest_OBJECTS = xtest.$(OBJEXT)
-@UNITTESTS_TRUE@xtest_DEPENDENCIES = $(am__DEPENDENCIES_3)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@xtest_DEPENDENCIES = $(am__DEPENDENCIES_3)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = libxservertest.c input.c xkb.c xtest.c
-DIST_SOURCES = libxservertest.c input.c xkb.c xtest.c
+SOURCES = $(nodist_libxservertest_la_SOURCES) fixes.c input.c list.c \
+	misc.c xkb.c xtest.c
+DIST_SOURCES = fixes.c input.c list.c misc.c xkb.c xtest.c
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-exec-recursive install-info-recursive \
@@ -113,8 +124,8 @@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AGP_FALSE = @AGP_FALSE@
 AGP_TRUE = @AGP_TRUE@
-AIGLX_FALSE = @AIGLX_FALSE@
-AIGLX_TRUE = @AIGLX_TRUE@
+AIGLX_DRI_LOADER_FALSE = @AIGLX_DRI_LOADER_FALSE@
+AIGLX_DRI_LOADER_TRUE = @AIGLX_DRI_LOADER_TRUE@
 ALLOCA = @ALLOCA@
 ALPHA_VIDEO_FALSE = @ALPHA_VIDEO_FALSE@
 ALPHA_VIDEO_TRUE = @ALPHA_VIDEO_TRUE@
@@ -127,7 +138,6 @@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
-ARM_BACKTRACE_CFLAGS = @ARM_BACKTRACE_CFLAGS@
 ARM_VIDEO_FALSE = @ARM_VIDEO_FALSE@
 ARM_VIDEO_TRUE = @ARM_VIDEO_TRUE@
 AS = @AS@
@@ -140,18 +150,19 @@ BSD_APM_FALSE = @BSD_APM_FALSE@
 BSD_APM_TRUE = @BSD_APM_TRUE@
 BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
 BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
-BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
-BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
 BUILD_DATE = @BUILD_DATE@
 BUILD_KDRIVEFBDEVLIB_FALSE = @BUILD_KDRIVEFBDEVLIB_FALSE@
 BUILD_KDRIVEFBDEVLIB_TRUE = @BUILD_KDRIVEFBDEVLIB_TRUE@
 BUILD_TIME = @BUILD_TIME@
+BUNDLE_ID_PREFIX = @BUNDLE_ID_PREFIX@
 CC = @CC@
 CCAS = @CCAS@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CHANGELOG_CMD = @CHANGELOG_CMD@
+CLIENTIDS_FALSE = @CLIENTIDS_FALSE@
+CLIENTIDS_TRUE = @CLIENTIDS_TRUE@
 COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 COMPOSITE_FALSE = @COMPOSITE_FALSE@
 COMPOSITE_TRUE = @COMPOSITE_TRUE@
@@ -168,12 +179,7 @@ CONFIG_WSCONS_TRUE = @CONFIG_WSCONS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DARWIN_LIBS = @DARWIN_LIBS@
 DBE_FALSE = @DBE_FALSE@
 DBE_TRUE = @DBE_TRUE@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -208,7 +214,6 @@ DMX_BUILD_USB_FALSE = @DMX_BUILD_USB_FALSE@
 DMX_BUILD_USB_TRUE = @DMX_BUILD_USB_TRUE@
 DMX_FALSE = @DMX_FALSE@
 DMX_TRUE = @DMX_TRUE@
-DOLT_BASH = @DOLT_BASH@
 DOXYGEN = @DOXYGEN@
 DPMSExtension_FALSE = @DPMSExtension_FALSE@
 DPMSExtension_TRUE = @DPMSExtension_TRUE@
@@ -229,7 +234,7 @@ DRI_LIBS = @DRI_LIBS@
 DRI_TRUE = @DRI_TRUE@
 DSYMUTIL = @DSYMUTIL@
 DTRACE = @DTRACE@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -238,11 +243,12 @@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@
 ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@
 ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@
 ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@
+ENABLE_UNIT_TESTS_FALSE = @ENABLE_UNIT_TESTS_FALSE@
+ENABLE_UNIT_TESTS_TRUE = @ENABLE_UNIT_TESTS_TRUE@
 EXEEXT = @EXEEXT@
-F77 = @F77@
 FBDEVHW_FALSE = @FBDEVHW_FALSE@
 FBDEVHW_TRUE = @FBDEVHW_TRUE@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FONT100DPIDIR = @FONT100DPIDIR@
@@ -255,11 +261,10 @@ FONTTYPE1DIR = @FONTTYPE1DIR@
 FOP = @FOP@
 FREEBSD_KLDLOAD_FALSE = @FREEBSD_KLDLOAD_FALSE@
 FREEBSD_KLDLOAD_TRUE = @FREEBSD_KLDLOAD_TRUE@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
 GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
 GLX_DEFINES = @GLX_DEFINES@
 GLX_FALSE = @GLX_FALSE@
+GLX_TLS = @GLX_TLS@
 GLX_TRUE = @GLX_TRUE@
 GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
@@ -272,12 +277,16 @@ HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@
 HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@
 HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
 HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
+HAVE_LD_WRAP_FALSE = @HAVE_LD_WRAP_FALSE@
+HAVE_LD_WRAP_TRUE = @HAVE_LD_WRAP_TRUE@
 HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
 HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
 HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
 HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
 HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
+HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
+HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
 HP300_VIDEO_FALSE = @HP300_VIDEO_FALSE@
 HP300_VIDEO_TRUE = @HP300_VIDEO_TRUE@
 HPPA_VIDEO_FALSE = @HPPA_VIDEO_FALSE@
@@ -323,7 +332,10 @@ KDRIVE_MOUSE_TRUE = @KDRIVE_MOUSE_TRUE@
 KDRIVE_PURE_INCS = @KDRIVE_PURE_INCS@
 KDRIVE_PURE_LIBS = @KDRIVE_PURE_LIBS@
 KDRIVE_TRUE = @KDRIVE_TRUE@
-LAUNCHD_ID_PREFIX = @LAUNCHD_ID_PREFIX@
+KHRONOS_OPENGL_REGISTRY_CFLAGS = @KHRONOS_OPENGL_REGISTRY_CFLAGS@
+KHRONOS_OPENGL_REGISTRY_LIBS = @KHRONOS_OPENGL_REGISTRY_LIBS@
+KHRONOS_SPEC_DIR = @KHRONOS_SPEC_DIR@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LD_EXPORT_SYMBOLS_FLAG = @LD_EXPORT_SYMBOLS_FLAG@
 LEX = @LEX@
@@ -342,19 +354,19 @@ LINUX_ALPHA_FALSE = @LINUX_ALPHA_FALSE@
 LINUX_ALPHA_TRUE = @LINUX_ALPHA_TRUE@
 LINUX_IA64_FALSE = @LINUX_IA64_FALSE@
 LINUX_IA64_TRUE = @LINUX_IA64_TRUE@
+LIPO = @LIPO@
 LNXACPI_FALSE = @LNXACPI_FALSE@
 LNXACPI_TRUE = @LNXACPI_TRUE@
 LNXAPM_FALSE = @LNXAPM_FALSE@
 LNXAPM_TRUE = @LNXAPM_TRUE@
 LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAIN_LIB = @MAIN_LIB@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
@@ -364,6 +376,7 @@ NEED_STRLCAT_FALSE = @NEED_STRLCAT_FALSE@
 NEED_STRLCAT_TRUE = @NEED_STRLCAT_TRUE@
 NEED_VSNPRINTF_FALSE = @NEED_VSNPRINTF_FALSE@
 NEED_VSNPRINTF_TRUE = @NEED_VSNPRINTF_TRUE@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJC = @OBJC@
 OBJCCLD = @OBJCCLD@
@@ -375,6 +388,8 @@ OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
 OS_LIB = @OS_LIB@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -385,7 +400,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
 PCIACCESS_LIBS = @PCIACCESS_LIBS@
 PCI_TXT_IDS_PATH = @PCI_TXT_IDS_PATH@
-PERL = @PERL@
 PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
 PIXMAN_LIBS = @PIXMAN_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
@@ -427,6 +441,7 @@ SPECIAL_DTRACE_OBJECTS_FALSE = @SPECIAL_DTRACE_OBJECTS_FALSE@
 SPECIAL_DTRACE_OBJECTS_TRUE = @SPECIAL_DTRACE_OBJECTS_TRUE@
 STANDALONE_XPBPROXY_FALSE = @STANDALONE_XPBPROXY_FALSE@
 STANDALONE_XPBPROXY_TRUE = @STANDALONE_XPBPROXY_TRUE@
+STRICT_CFLAGS = @STRICT_CFLAGS@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 SYSCONFDIR = @SYSCONFDIR@
@@ -436,8 +451,6 @@ TSLIB_LIBS = @TSLIB_LIBS@
 TSLIB_TRUE = @TSLIB_TRUE@
 UDEV_CFLAGS = @UDEV_CFLAGS@
 UDEV_LIBS = @UDEV_LIBS@
-UNITTESTS_FALSE = @UNITTESTS_FALSE@
-UNITTESTS_TRUE = @UNITTESTS_TRUE@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VBE_FALSE = @VBE_FALSE@
 VBE_TRUE = @VBE_TRUE@
@@ -454,8 +467,6 @@ XAA_FALSE = @XAA_FALSE@
 XAA_TRUE = @XAA_TRUE@
 XACE_FALSE = @XACE_FALSE@
 XACE_TRUE = @XACE_TRUE@
-XCALIBRATE_FALSE = @XCALIBRATE_FALSE@
-XCALIBRATE_TRUE = @XCALIBRATE_TRUE@
 XCSECURITY_FALSE = @XCSECURITY_FALSE@
 XCSECURITY_TRUE = @XCSECURITY_TRUE@
 XDMAUTH_FALSE = @XDMAUTH_FALSE@
@@ -491,6 +502,11 @@ XINERAMA_TRUE = @XINERAMA_TRUE@
 XKB_BASE_DIRECTORY = @XKB_BASE_DIRECTORY@
 XKB_BIN_DIRECTORY = @XKB_BIN_DIRECTORY@
 XKB_COMPILED_DIR = @XKB_COMPILED_DIR@
+XKB_DFLT_LAYOUT = @XKB_DFLT_LAYOUT@
+XKB_DFLT_MODEL = @XKB_DFLT_MODEL@
+XKB_DFLT_OPTIONS = @XKB_DFLT_OPTIONS@
+XKB_DFLT_RULES = @XKB_DFLT_RULES@
+XKB_DFLT_VARIANT = @XKB_DFLT_VARIANT@
 XKM_OUTPUT_DIR = @XKM_OUTPUT_DIR@
 XLIB_CFLAGS = @XLIB_CFLAGS@
 XLIB_LIBS = @XLIB_LIBS@
@@ -522,6 +538,7 @@ XORG_TRUE = @XORG_TRUE@
 XPBPROXY_CFLAGS = @XPBPROXY_CFLAGS@
 XPBPROXY_LIBS = @XPBPROXY_LIBS@
 XQUARTZ_FALSE = @XQUARTZ_FALSE@
+XQUARTZ_LIBS = @XQUARTZ_LIBS@
 XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XQUARTZ_SPARKLE_FALSE = @XQUARTZ_SPARKLE_FALSE@
 XQUARTZ_SPARKLE_TRUE = @XQUARTZ_SPARKLE_TRUE@
@@ -540,6 +557,7 @@ XSERVER_DTRACE_FALSE = @XSERVER_DTRACE_FALSE@
 XSERVER_DTRACE_TRUE = @XSERVER_DTRACE_TRUE@
 XSERVER_LIBS = @XSERVER_LIBS@
 XSERVER_SYS_LIBS = @XSERVER_SYS_LIBS@
+XSLTPROC = @XSLTPROC@
 XSL_STYLESHEET = @XSL_STYLESHEET@
 XTSTEXAMPLES_DEP_CFLAGS = @XTSTEXAMPLES_DEP_CFLAGS@
 XTSTEXAMPLES_DEP_LIBS = @XTSTEXAMPLES_DEP_LIBS@
@@ -584,13 +602,11 @@ abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
 abi_videodrv = @abi_videodrv@
 abi_xinput = @abi_xinput@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
 am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
 am__include = @am__include@
@@ -640,35 +656,44 @@ symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
 sysconfigdir = @sysconfigdir@
 target_alias = @target_alias@
-@UNITTESTS_TRUE@SUBDIRS = . xi2
-@UNITTESTS_TRUE@check_LTLIBRARIES = libxservertest.la
-@UNITTESTS_TRUE@TESTS = $(check_PROGRAMS)
-@UNITTESTS_TRUE@AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
-@UNITTESTS_TRUE@INCLUDES = @XORG_INCS@
-@UNITTESTS_TRUE@TEST_LDADD = libxservertest.la $(XORG_SYS_LIBS) \
-@UNITTESTS_TRUE@	$(XSERVER_SYS_LIBS) $(GLIB_LIBS) \
-@UNITTESTS_TRUE@	$(am__append_1)
-@UNITTESTS_TRUE@xkb_LDADD = $(TEST_LDADD)
-@UNITTESTS_TRUE@input_LDADD = $(TEST_LDADD)
-@UNITTESTS_TRUE@xtest_LDADD = $(TEST_LDADD)
-@UNITTESTS_TRUE@libxservertest_la_LIBADD = \
-@UNITTESTS_TRUE@            $(XSERVER_LIBS) \
-@UNITTESTS_TRUE@            $(top_builddir)/hw/xfree86/loader/libloader.la \
-@UNITTESTS_TRUE@            $(top_builddir)/hw/xfree86/os-support/libxorgos.la \
-@UNITTESTS_TRUE@            $(top_builddir)/hw/xfree86/common/libcommon.la \
-@UNITTESTS_TRUE@            $(top_builddir)/hw/xfree86/parser/libxf86config_internal.la \
-@UNITTESTS_TRUE@            $(top_builddir)/hw/xfree86/dixmods/libdixmods.la \
-@UNITTESTS_TRUE@            $(top_builddir)/hw/xfree86/modes/libxf86modes.la \
-@UNITTESTS_TRUE@            $(top_builddir)/hw/xfree86/ramdac/libramdac.la \
-@UNITTESTS_TRUE@            $(top_builddir)/hw/xfree86/ddc/libddc.la \
-@UNITTESTS_TRUE@            $(top_builddir)/hw/xfree86/i2c/libi2c.la \
-@UNITTESTS_TRUE@            $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
-@UNITTESTS_TRUE@            $(top_builddir)/hw/xfree86/libxorg.la \
-@UNITTESTS_TRUE@            $(top_builddir)/mi/libmi.la \
-@UNITTESTS_TRUE@            $(top_builddir)/os/libos.la \
-@UNITTESTS_TRUE@            @XORG_LIBS@
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@SUBDIRS = . xi2
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@check_LTLIBRARIES = libxservertest.la
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@TESTS = $(noinst_PROGRAMS)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	-I$(top_srcdir)/miext/cw -I$(top_srcdir)/hw/xfree86/ddc \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	-I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	-I$(top_srcdir)/hw/xfree86/ramdac
+
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@TEST_LDADD =  \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	libxservertest.la \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	$(XORG_SYS_LIBS) \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	$(XSERVER_SYS_LIBS) \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	$(am__append_1)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@xkb_LDADD = $(TEST_LDADD)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@input_LDADD = $(TEST_LDADD)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@xtest_LDADD = $(TEST_LDADD)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@list_LDADD = $(TEST_LDADD)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@misc_LDADD = $(TEST_LDADD)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@fixes_LDADD = $(TEST_LDADD)
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@libxservertest_la_LIBADD = \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@            $(XSERVER_LIBS) \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@            $(top_builddir)/hw/xfree86/loader/libloader.la \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@            $(top_builddir)/hw/xfree86/os-support/libxorgos.la \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@            $(top_builddir)/hw/xfree86/common/libcommon.la \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@            $(top_builddir)/hw/xfree86/parser/libxf86config_internal.la \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@            $(top_builddir)/hw/xfree86/dixmods/libdixmods.la \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@            $(top_builddir)/hw/xfree86/modes/libxf86modes.la \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@            $(top_builddir)/hw/xfree86/ramdac/libramdac.la \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@            $(top_builddir)/hw/xfree86/ddc/libddc.la \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@            $(top_builddir)/hw/xfree86/i2c/libi2c.la \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@            $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@            $(top_builddir)/mi/libmi.la \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@            $(top_builddir)/os/libos.la \
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@            @XORG_LIBS@
 
-CLEANFILES = libxservertest.c
+@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@libxservertest_la_DEPENDENCIES = $(libxservertest_la_LIBADD)
 all: all-recursive
 
 .SUFFIXES:
@@ -714,15 +739,24 @@ clean-checkLTLIBRARIES:
 libxservertest.la: $(libxservertest_la_OBJECTS) $(libxservertest_la_DEPENDENCIES) 
 	$(LINK) $(am_libxservertest_la_rpath) $(libxservertest_la_LDFLAGS) $(libxservertest_la_OBJECTS) $(libxservertest_la_LIBADD) $(LIBS)
 
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; for p in $$list; do \
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
 	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
+fixes$(EXEEXT): $(fixes_OBJECTS) $(fixes_DEPENDENCIES) 
+	@rm -f fixes$(EXEEXT)
+	$(LINK) $(fixes_LDFLAGS) $(fixes_OBJECTS) $(fixes_LDADD) $(LIBS)
 input$(EXEEXT): $(input_OBJECTS) $(input_DEPENDENCIES) 
 	@rm -f input$(EXEEXT)
 	$(LINK) $(input_LDFLAGS) $(input_OBJECTS) $(input_LDADD) $(LIBS)
+list$(EXEEXT): $(list_OBJECTS) $(list_DEPENDENCIES) 
+	@rm -f list$(EXEEXT)
+	$(LINK) $(list_LDFLAGS) $(list_OBJECTS) $(list_LDADD) $(LIBS)
+misc$(EXEEXT): $(misc_OBJECTS) $(misc_DEPENDENCIES) 
+	@rm -f misc$(EXEEXT)
+	$(LINK) $(misc_LDFLAGS) $(misc_OBJECTS) $(misc_LDADD) $(LIBS)
 xkb$(EXEEXT): $(xkb_OBJECTS) $(xkb_DEPENDENCIES) 
 	@rm -f xkb$(EXEEXT)
 	$(LINK) $(xkb_LDFLAGS) $(xkb_OBJECTS) $(xkb_LDADD) $(LIBS)
@@ -736,8 +770,11 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixes.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/input.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxservertest.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sdksyms.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xkb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xtest.Po@am__quote@
 
@@ -762,6 +799,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+sdksyms.lo: $(top_builddir)/hw/xfree86/sdksyms.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sdksyms.lo -MD -MP -MF "$(DEPDIR)/sdksyms.Tpo" -c -o sdksyms.lo `test -f '$(top_builddir)/hw/xfree86/sdksyms.c' || echo '$(srcdir)/'`$(top_builddir)/hw/xfree86/sdksyms.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/sdksyms.Tpo" "$(DEPDIR)/sdksyms.Plo"; else rm -f "$(DEPDIR)/sdksyms.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/hw/xfree86/sdksyms.c' object='sdksyms.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sdksyms.lo `test -f '$(top_builddir)/hw/xfree86/sdksyms.c' || echo '$(srcdir)/'`$(top_builddir)/hw/xfree86/sdksyms.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -1020,10 +1064,10 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(PROGRAMS)
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
@@ -1043,7 +1087,6 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -1053,8 +1096,8 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
-	clean-libtool mostlyclean-am
+clean-am: clean-checkLTLIBRARIES clean-generic clean-libtool \
+	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
@@ -1105,8 +1148,8 @@ uninstall-am: uninstall-info-am
 uninstall-info: uninstall-info-recursive
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-TESTS \
-	check-am clean clean-checkLTLIBRARIES clean-checkPROGRAMS \
-	clean-generic clean-libtool clean-recursive ctags \
+	check-am clean clean-checkLTLIBRARIES clean-generic \
+	clean-libtool clean-noinstPROGRAMS clean-recursive ctags \
 	ctags-recursive distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-recursive distclean-tags distdir \
 	dvi dvi-am html html-am info info-am install install-am \
@@ -1119,9 +1162,6 @@ uninstall-info: uninstall-info-recursive
 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
 	uninstall-info-am
 
-
-libxservertest.c:
-	touch $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: