Update to xserver 1.12.2. tested by naddy@, krw@, mpi@.

1 files changed, 198 insertions, 74 deletions

diff --git a/xserver/test/Makefile.in b/xserver/test/Makefile.in
index f3bbdc228..eae1fb56f 100644
--- a/xserver/test/Makefile.in
+++ b/xserver/test/Makefile.in
@@ -36,14 +36,65 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@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)
+@ENABLE_UNIT_TESTS_TRUE@noinst_PROGRAMS = list$(EXEEXT) \
+@ENABLE_UNIT_TESTS_TRUE@	string$(EXEEXT) touch$(EXEEXT) \
+@ENABLE_UNIT_TESTS_TRUE@	$(am__EXEEXT_1)
+# Tests that require at least some DDX functions in order to fully link
+# For now, requires xf86 ddx, could be adjusted to use another
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@am__append_1 = xi2
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@am__append_2 = xkb input xtest misc fixes xfree86
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@am__append_3 = -I$(top_srcdir)/hw/xfree86/parser \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	-I$(top_srcdir)/hw/xfree86/ddc \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	-I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	-I$(top_srcdir)/hw/xfree86/ramdac
+
+@ENABLE_UNIT_TESTS_TRUE@@SPECIAL_DTRACE_OBJECTS_TRUE@@XORG_TRUE@am__append_4 = $(OS_LIB) $(DIX_LIB)
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@am__append_5 = \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@            $(top_builddir)/hw/xfree86/loader/libloader.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@            $(top_builddir)/hw/xfree86/os-support/libxorgos.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@            $(top_builddir)/hw/xfree86/common/libcommon.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@            $(top_builddir)/hw/xfree86/parser/libxf86config_internal.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@            $(top_builddir)/hw/xfree86/dixmods/libdixmods.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@            $(top_builddir)/hw/xfree86/modes/libxf86modes.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@            $(top_builddir)/hw/xfree86/ramdac/libramdac.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@            $(top_builddir)/hw/xfree86/ddc/libddc.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@            $(top_builddir)/hw/xfree86/i2c/libi2c.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@            $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@            @XORG_LIBS@
+
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@am__append_6 = \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_builddir)/damageext/libdamageext.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_builddir)/fb/libfb.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_builddir)/fb/libwfb.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_builddir)/miext/damage/libdamage.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_builddir)/miext/sync/libsync.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_builddir)/randr/librandr.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_builddir)/render/librender.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_builddir)/Xext/libXext.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_builddir)/Xi/libXi.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_builddir)/xfixes/libxfixes.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_builddir)/xkb/libxkb.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_builddir)/xkb/libxkbstubs.la
+
+@COMPOSITE_TRUE@@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@am__append_7 = \
+@COMPOSITE_TRUE@@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_builddir)/composite/libcomposite.la
+
+@DBE_TRUE@@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@am__append_8 = \
+@DBE_TRUE@@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_builddir)/dbe/libdbe.la
+
+@ENABLE_UNIT_TESTS_TRUE@@GLX_TRUE@@XORG_FALSE@am__append_9 = \
+@ENABLE_UNIT_TESTS_TRUE@@GLX_TRUE@@XORG_FALSE@            $(top_builddir)/glx/libglx.la
+
+@ENABLE_UNIT_TESTS_TRUE@@RECORD_TRUE@@XORG_FALSE@am__append_10 = \
+@ENABLE_UNIT_TESTS_TRUE@@RECORD_TRUE@@XORG_FALSE@            $(top_builddir)/record/librecord.la
+
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@@XQUARTZ_TRUE@am__append_11 = \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@@XQUARTZ_TRUE@            $(top_builddir)/miext/rootless/librootless.la
+
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@@XQUARTZ_TRUE@am__append_12 = -lXplugin
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@@XWIN_MULTIWINDOWEXTWM_TRUE@am__append_13 = \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@@XWIN_MULTIWINDOWEXTWM_TRUE@            $(top_builddir)/miext/rootless/librootless.la
+
 subdir = test
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -65,36 +116,82 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
 	$(top_builddir)/include/version-config.h
 CONFIG_CLEAN_FILES =
 am__DEPENDENCIES_1 =
-@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@nodist_libxservertest_la_OBJECTS =  \
-@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	sdksyms.lo
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/hw/xfree86/loader/libloader.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	$(top_builddir)/hw/xfree86/os-support/libxorgos.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	$(top_builddir)/hw/xfree86/common/libcommon.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	$(top_builddir)/hw/xfree86/parser/libxf86config_internal.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	$(top_builddir)/hw/xfree86/dixmods/libdixmods.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	$(top_builddir)/hw/xfree86/modes/libxf86modes.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	$(top_builddir)/hw/xfree86/ramdac/libramdac.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	$(top_builddir)/hw/xfree86/ddc/libddc.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	$(top_builddir)/hw/xfree86/i2c/libi2c.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	$(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@am__DEPENDENCIES_3 = $(top_builddir)/damageext/libdamageext.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@	$(top_builddir)/fb/libfb.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@	$(top_builddir)/fb/libwfb.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@	$(top_builddir)/miext/damage/libdamage.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@	$(top_builddir)/miext/sync/libsync.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@	$(top_builddir)/randr/librandr.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@	$(top_builddir)/render/librender.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@	$(top_builddir)/Xext/libXext.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@	$(top_builddir)/Xi/libXi.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@	$(top_builddir)/xfixes/libxfixes.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@	$(top_builddir)/xkb/libxkb.la \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@	$(top_builddir)/xkb/libxkbstubs.la
+@COMPOSITE_TRUE@@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@am__DEPENDENCIES_4 = $(top_builddir)/composite/libcomposite.la
+@DBE_TRUE@@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@am__DEPENDENCIES_5 = $(top_builddir)/dbe/libdbe.la
+@ENABLE_UNIT_TESTS_TRUE@@GLX_TRUE@@XORG_FALSE@am__DEPENDENCIES_6 = $(top_builddir)/glx/libglx.la
+@ENABLE_UNIT_TESTS_TRUE@@RECORD_TRUE@@XORG_FALSE@am__DEPENDENCIES_7 = $(top_builddir)/record/librecord.la
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@@XQUARTZ_TRUE@am__DEPENDENCIES_8 = $(top_builddir)/miext/rootless/librootless.la
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@@XWIN_MULTIWINDOWEXTWM_TRUE@am__DEPENDENCIES_9 = $(top_builddir)/miext/rootless/librootless.la
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@nodist_libxservertest_la_OBJECTS =  \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@	ddxstubs.lo miinitext.lo \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@	dpmsstubs.lo stubs.lo
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@nodist_libxservertest_la_OBJECTS =  \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	sdksyms.lo
 libxservertest_la_OBJECTS = $(nodist_libxservertest_la_OBJECTS)
-@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@am_libxservertest_la_rpath =
+@ENABLE_UNIT_TESTS_TRUE@am_libxservertest_la_rpath =
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@am__EXEEXT_1 = xkb$(EXEEXT) \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	input$(EXEEXT) \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	xtest$(EXEEXT) \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	misc$(EXEEXT) \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	fixes$(EXEEXT) \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@	xfree86$(EXEEXT)
 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)
+@ENABLE_UNIT_TESTS_TRUE@@SPECIAL_DTRACE_OBJECTS_TRUE@@XORG_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1) \
+@ENABLE_UNIT_TESTS_TRUE@@SPECIAL_DTRACE_OBJECTS_TRUE@@XORG_TRUE@	$(am__DEPENDENCIES_1)
+@ENABLE_UNIT_TESTS_TRUE@am__DEPENDENCIES_11 = libxservertest.la \
+@ENABLE_UNIT_TESTS_TRUE@	$(am__DEPENDENCIES_1) \
+@ENABLE_UNIT_TESTS_TRUE@	$(am__DEPENDENCIES_1) \
+@ENABLE_UNIT_TESTS_TRUE@	$(am__DEPENDENCIES_10) \
+@ENABLE_UNIT_TESTS_TRUE@	$(am__DEPENDENCIES_1)
+@ENABLE_UNIT_TESTS_TRUE@fixes_DEPENDENCIES = $(am__DEPENDENCIES_11)
 input_SOURCES = input.c
 input_OBJECTS = input.$(OBJEXT)
-@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@input_DEPENDENCIES = $(am__DEPENDENCIES_3)
+@ENABLE_UNIT_TESTS_TRUE@input_DEPENDENCIES = $(am__DEPENDENCIES_11)
 list_SOURCES = list.c
 list_OBJECTS = list.$(OBJEXT)
-@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@list_DEPENDENCIES = $(am__DEPENDENCIES_3)
+@ENABLE_UNIT_TESTS_TRUE@list_DEPENDENCIES = $(am__DEPENDENCIES_11)
 misc_SOURCES = misc.c
 misc_OBJECTS = misc.$(OBJEXT)
-@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@misc_DEPENDENCIES = $(am__DEPENDENCIES_3)
+@ENABLE_UNIT_TESTS_TRUE@misc_DEPENDENCIES = $(am__DEPENDENCIES_11)
+string_SOURCES = string.c
+string_OBJECTS = string.$(OBJEXT)
+string_LDADD = $(LDADD)
+touch_SOURCES = touch.c
+touch_OBJECTS = touch.$(OBJEXT)
+@ENABLE_UNIT_TESTS_TRUE@touch_DEPENDENCIES = $(am__DEPENDENCIES_11)
+xfree86_SOURCES = xfree86.c
+xfree86_OBJECTS = xfree86.$(OBJEXT)
+@ENABLE_UNIT_TESTS_TRUE@xfree86_DEPENDENCIES = $(am__DEPENDENCIES_11)
 xkb_SOURCES = xkb.c
 xkb_OBJECTS = xkb.$(OBJEXT)
-@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@xkb_DEPENDENCIES = $(am__DEPENDENCIES_3)
+@ENABLE_UNIT_TESTS_TRUE@xkb_DEPENDENCIES = $(am__DEPENDENCIES_11)
 xtest_SOURCES = xtest.c
 xtest_OBJECTS = xtest.$(OBJEXT)
-@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@xtest_DEPENDENCIES = $(am__DEPENDENCIES_3)
+@ENABLE_UNIT_TESTS_TRUE@xtest_DEPENDENCIES = $(am__DEPENDENCIES_11)
 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
@@ -107,8 +204,9 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 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
+	misc.c string.c touch.c xfree86.c xkb.c xtest.c
+DIST_SOURCES = fixes.c input.c list.c misc.c string.c touch.c \
+	xfree86.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 \
@@ -126,7 +224,6 @@ AGP_FALSE = @AGP_FALSE@
 AGP_TRUE = @AGP_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@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -145,6 +242,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASE_CFLAGS = @BASE_CFLAGS@
 BASE_FONT_PATH = @BASE_FONT_PATH@
 BSD_APM_FALSE = @BSD_APM_FALSE@
 BSD_APM_TRUE = @BSD_APM_TRUE@
@@ -352,8 +450,6 @@ LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 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@
@@ -372,10 +468,6 @@ MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MITSHM_FALSE = @MITSHM_FALSE@
 MITSHM_TRUE = @MITSHM_TRUE@
-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@
@@ -519,18 +611,18 @@ XNEST_SYS_LIBS = @XNEST_SYS_LIBS@
 XNEST_TRUE = @XNEST_TRUE@
 XORG_BUS_BSDPCI_FALSE = @XORG_BUS_BSDPCI_FALSE@
 XORG_BUS_BSDPCI_TRUE = @XORG_BUS_BSDPCI_TRUE@
-XORG_BUS_LINUXPCI_FALSE = @XORG_BUS_LINUXPCI_FALSE@
-XORG_BUS_LINUXPCI_TRUE = @XORG_BUS_LINUXPCI_TRUE@
+XORG_BUS_PCI_FALSE = @XORG_BUS_PCI_FALSE@
+XORG_BUS_PCI_TRUE = @XORG_BUS_PCI_TRUE@
 XORG_BUS_SPARC_FALSE = @XORG_BUS_SPARC_FALSE@
 XORG_BUS_SPARC_TRUE = @XORG_BUS_SPARC_TRUE@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_FALSE = @XORG_FALSE@
 XORG_INCS = @XORG_INCS@
 XORG_LIBS = @XORG_LIBS@
+XORG_MALLOC_DEBUG_ENV = @XORG_MALLOC_DEBUG_ENV@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XORG_MODULES_CFLAGS = @XORG_MODULES_CFLAGS@
 XORG_MODULES_LIBS = @XORG_MODULES_LIBS@
-XORG_OS = @XORG_OS@
 XORG_OS_SUBDIR = @XORG_OS_SUBDIR@
 XORG_SGML_PATH = @XORG_SGML_PATH@
 XORG_SYS_LIBS = @XORG_SYS_LIBS@
@@ -656,44 +748,39 @@ symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
 sysconfigdir = @sysconfigdir@
 target_alias = @target_alias@
-@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@
-
-@ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@libxservertest_la_DEPENDENCIES = $(libxservertest_la_LIBADD)
+@ENABLE_UNIT_TESTS_TRUE@SUBDIRS = . $(am__append_1)
+@ENABLE_UNIT_TESTS_TRUE@check_LTLIBRARIES = libxservertest.la
+@ENABLE_UNIT_TESTS_TRUE@TESTS = $(noinst_PROGRAMS)
+@ENABLE_UNIT_TESTS_TRUE@TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
+@ENABLE_UNIT_TESTS_TRUE@AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
+@ENABLE_UNIT_TESTS_TRUE@INCLUDES = $(XORG_INCS) \
+@ENABLE_UNIT_TESTS_TRUE@	-I$(top_srcdir)/miext/cw \
+@ENABLE_UNIT_TESTS_TRUE@	$(am__append_3)
+@ENABLE_UNIT_TESTS_TRUE@TEST_LDADD = libxservertest.la \
+@ENABLE_UNIT_TESTS_TRUE@	$(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) \
+@ENABLE_UNIT_TESTS_TRUE@	$(am__append_4) $(am__append_12)
+@ENABLE_UNIT_TESTS_TRUE@xkb_LDADD = $(TEST_LDADD)
+@ENABLE_UNIT_TESTS_TRUE@input_LDADD = $(TEST_LDADD)
+@ENABLE_UNIT_TESTS_TRUE@xtest_LDADD = $(TEST_LDADD)
+@ENABLE_UNIT_TESTS_TRUE@list_LDADD = $(TEST_LDADD)
+@ENABLE_UNIT_TESTS_TRUE@misc_LDADD = $(TEST_LDADD)
+@ENABLE_UNIT_TESTS_TRUE@fixes_LDADD = $(TEST_LDADD)
+@ENABLE_UNIT_TESTS_TRUE@xfree86_LDADD = $(TEST_LDADD)
+@ENABLE_UNIT_TESTS_TRUE@touch_LDADD = $(TEST_LDADD)
+@ENABLE_UNIT_TESTS_TRUE@libxservertest_la_LIBADD = $(XSERVER_LIBS) \
+@ENABLE_UNIT_TESTS_TRUE@	$(am__append_5) $(am__append_6) \
+@ENABLE_UNIT_TESTS_TRUE@	$(am__append_7) $(am__append_8) \
+@ENABLE_UNIT_TESTS_TRUE@	$(am__append_9) $(am__append_10) \
+@ENABLE_UNIT_TESTS_TRUE@	$(am__append_11) $(am__append_13)
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@nodist_libxservertest_la_SOURCES = \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            ddxstubs.c \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_srcdir)/mi/miinitext.c \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_srcdir)/Xext/dpmsstubs.c \
+@ENABLE_UNIT_TESTS_TRUE@@XORG_FALSE@            $(top_srcdir)/Xi/stubs.c
+
+@ENABLE_UNIT_TESTS_TRUE@@XORG_TRUE@nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c
+@ENABLE_UNIT_TESTS_TRUE@libxservertest_la_DEPENDENCIES = $(libxservertest_la_LIBADD)
+EXTRA_DIST = ddxstubs.c
 all: all-recursive
 
 .SUFFIXES:
@@ -757,6 +844,15 @@ list$(EXEEXT): $(list_OBJECTS) $(list_DEPENDENCIES)
 misc$(EXEEXT): $(misc_OBJECTS) $(misc_DEPENDENCIES) 
 	@rm -f misc$(EXEEXT)
 	$(LINK) $(misc_LDFLAGS) $(misc_OBJECTS) $(misc_LDADD) $(LIBS)
+string$(EXEEXT): $(string_OBJECTS) $(string_DEPENDENCIES) 
+	@rm -f string$(EXEEXT)
+	$(LINK) $(string_LDFLAGS) $(string_OBJECTS) $(string_LDADD) $(LIBS)
+touch$(EXEEXT): $(touch_OBJECTS) $(touch_DEPENDENCIES) 
+	@rm -f touch$(EXEEXT)
+	$(LINK) $(touch_LDFLAGS) $(touch_OBJECTS) $(touch_LDADD) $(LIBS)
+xfree86$(EXEEXT): $(xfree86_OBJECTS) $(xfree86_DEPENDENCIES) 
+	@rm -f xfree86$(EXEEXT)
+	$(LINK) $(xfree86_LDFLAGS) $(xfree86_OBJECTS) $(xfree86_LDADD) $(LIBS)
 xkb$(EXEEXT): $(xkb_OBJECTS) $(xkb_DEPENDENCIES) 
 	@rm -f xkb$(EXEEXT)
 	$(LINK) $(xkb_LDFLAGS) $(xkb_OBJECTS) $(xkb_LDADD) $(LIBS)
@@ -770,11 +866,18 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddxstubs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dpmsstubs.Plo@am__quote@
 @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)/list.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/miinitext.Plo@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)/string.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stubs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/touch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfree86.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xkb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xtest.Po@am__quote@
 
@@ -799,6 +902,27 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+miinitext.lo: $(top_srcdir)/mi/miinitext.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT miinitext.lo -MD -MP -MF "$(DEPDIR)/miinitext.Tpo" -c -o miinitext.lo `test -f '$(top_srcdir)/mi/miinitext.c' || echo '$(srcdir)/'`$(top_srcdir)/mi/miinitext.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/miinitext.Tpo" "$(DEPDIR)/miinitext.Plo"; else rm -f "$(DEPDIR)/miinitext.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/mi/miinitext.c' object='miinitext.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 miinitext.lo `test -f '$(top_srcdir)/mi/miinitext.c' || echo '$(srcdir)/'`$(top_srcdir)/mi/miinitext.c
+
+dpmsstubs.lo: $(top_srcdir)/Xext/dpmsstubs.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dpmsstubs.lo -MD -MP -MF "$(DEPDIR)/dpmsstubs.Tpo" -c -o dpmsstubs.lo `test -f '$(top_srcdir)/Xext/dpmsstubs.c' || echo '$(srcdir)/'`$(top_srcdir)/Xext/dpmsstubs.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/dpmsstubs.Tpo" "$(DEPDIR)/dpmsstubs.Plo"; else rm -f "$(DEPDIR)/dpmsstubs.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/Xext/dpmsstubs.c' object='dpmsstubs.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 dpmsstubs.lo `test -f '$(top_srcdir)/Xext/dpmsstubs.c' || echo '$(srcdir)/'`$(top_srcdir)/Xext/dpmsstubs.c
+
+stubs.lo: $(top_srcdir)/Xi/stubs.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stubs.lo -MD -MP -MF "$(DEPDIR)/stubs.Tpo" -c -o stubs.lo `test -f '$(top_srcdir)/Xi/stubs.c' || echo '$(srcdir)/'`$(top_srcdir)/Xi/stubs.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/stubs.Tpo" "$(DEPDIR)/stubs.Plo"; else rm -f "$(DEPDIR)/stubs.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/Xi/stubs.c' object='stubs.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 stubs.lo `test -f '$(top_srcdir)/Xi/stubs.c' || echo '$(srcdir)/'`$(top_srcdir)/Xi/stubs.c
+
 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