svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .

1 files changed, 48 insertions, 27 deletions

diff --git a/xorg-server/Xext/Makefile.in b/xorg-server/Xext/Makefile.in
index 7581a4de7..6c7a2e594 100644
--- a/xorg-server/Xext/Makefile.in
+++ b/xorg-server/Xext/Makefile.in
@@ -40,19 +40,24 @@ host_triplet = @host@
 @RES_TRUE@am__append_3 = $(RES_SRCS)
 @SCREENSAVER_TRUE@am__append_4 = $(SCREENSAVER_SRCS)
 @XINERAMA_TRUE@am__append_5 = $(XINERAMA_SRCS)
-@XACE_TRUE@am__append_6 = $(XACE_SRCS)
-@XSELINUX_TRUE@am__append_7 = $(XSELINUX_SRCS)
-@XCSECURITY_TRUE@am__append_8 = $(XCSECURITY_SRCS)
-@XCALIBRATE_TRUE@am__append_9 = $(XCALIBRATE_SRCS)
-@MULTIBUFFER_TRUE@am__append_10 = $(MULTIBUFFER_SRCS)
-@XF86BIGFONT_TRUE@am__append_11 = $(BIGFONT_SRCS)
-@DPMSExtension_TRUE@am__append_12 = $(DPMS_SRCS)
+@XINERAMA_TRUE@@XORG_TRUE@am__append_6 = panoramiXsrv.h panoramiX.h
+@XACE_TRUE@am__append_7 = $(XACE_SRCS)
+@XACE_TRUE@@XORG_TRUE@am__append_8 = xace.h xacestr.h
+@XSELINUX_TRUE@am__append_9 = $(XSELINUX_SRCS)
+@XCSECURITY_TRUE@am__append_10 = $(XCSECURITY_SRCS)
+@XCALIBRATE_TRUE@am__append_11 = $(XCALIBRATE_SRCS)
+@MULTIBUFFER_TRUE@am__append_12 = $(MULTIBUFFER_SRCS)
+@XF86BIGFONT_TRUE@am__append_13 = $(BIGFONT_SRCS)
+@DPMSExtension_TRUE@am__append_14 = $(DPMS_SRCS)
 subdir = Xext
 DIST_COMMON = $(am__sdk_HEADERS_DIST) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
+	$(top_srcdir)/m4/dolt.m4 $(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/shave.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -62,13 +67,14 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
 	$(top_builddir)/include/xorg-config.h \
 	$(top_builddir)/include/xkb-config.h \
 	$(top_builddir)/include/xwin-config.h \
-	$(top_builddir)/include/kdrive-config.h
+	$(top_builddir)/include/kdrive-config.h \
+	$(top_builddir)/include/version-config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libXext_la_LIBADD =
 am__libXext_la_SOURCES_DIST = bigreq.c geext.c shape.c sleepuntil.c \
-	sleepuntil.h sync.c xcmisc.c xtest.c shm.c shmint.h \
+	sleepuntil.h sync.c syncsrv.h xcmisc.c xtest.c shm.c shmint.h \
 	panoramiX.c panoramiX.h panoramiXh.h panoramiXsrv.h \
 	panoramiXprocs.c panoramiXSwap.c xace.c xace.h xacestr.h \
 	security.c securitysrv.h xcalibrate.c xf86bigfont.c xvmain.c \
@@ -110,10 +116,10 @@ libXext_la_OBJECTS = $(am_libXext_la_OBJECTS)
 @XORG_TRUE@am_libXext_la_rpath =
 libXextbuiltin_la_LIBADD =
 am__libXextbuiltin_la_SOURCES_DIST = bigreq.c geext.c shape.c \
-	sleepuntil.c sleepuntil.h sync.c xcmisc.c xtest.c shm.c \
-	shmint.h panoramiX.c panoramiX.h panoramiXh.h panoramiXsrv.h \
-	panoramiXprocs.c panoramiXSwap.c xace.c xace.h xacestr.h \
-	security.c securitysrv.h xcalibrate.c xf86bigfont.c
+	sleepuntil.c sleepuntil.h sync.c syncsrv.h xcmisc.c xtest.c \
+	shm.c shmint.h panoramiX.c panoramiX.h panoramiXh.h \
+	panoramiXsrv.h panoramiXprocs.c panoramiXSwap.c xace.c xace.h \
+	xacestr.h security.c securitysrv.h xcalibrate.c xf86bigfont.c
 @XORG_TRUE@am_libXextbuiltin_la_OBJECTS = $(am__objects_13)
 libXextbuiltin_la_OBJECTS = $(am_libXextbuiltin_la_OBJECTS)
 @XORG_TRUE@am_libXextbuiltin_la_rpath =
@@ -139,7 +145,8 @@ SOURCES = $(libXext_la_SOURCES) $(libXextbuiltin_la_SOURCES) \
 DIST_SOURCES = $(am__libXext_la_SOURCES_DIST) \
 	$(am__libXextbuiltin_la_SOURCES_DIST) \
 	$(am__libXextmodule_la_SOURCES_DIST)
-am__sdk_HEADERS_DIST = xvdix.h xvmcext.h geext.h geint.h shmint.h
+am__sdk_HEADERS_DIST = xvdix.h xvmcext.h geext.h geint.h shmint.h \
+	panoramiXsrv.h panoramiX.h xace.h xacestr.h
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -171,6 +178,7 @@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
 APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_ID = @APPLE_APPLICATION_ID@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
@@ -191,9 +199,12 @@ CCASDEPMODE = @CCASDEPMODE@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
 CYGPATH_W = @CYGPATH_W@
 DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -222,7 +233,9 @@ DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
 DRIPROTO_LIBS = @DRIPROTO_LIBS@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DRI_CFLAGS = @DRI_CFLAGS@
 DRI_DRIVER_PATH = @DRI_DRIVER_PATH@
+DRI_LIBS = @DRI_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DTRACE = @DTRACE@
 DUMPBIN = @DUMPBIN@
@@ -231,9 +244,13 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FC = @FC@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
 GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
 GLX_DEFINES = @GLX_DEFINES@
 GL_CFLAGS = @GL_CFLAGS@
@@ -272,12 +289,13 @@ LTCOMPILE = @LTCOMPILE@
 LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
+MAIN_LIB = @MAIN_LIB@
+MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MAKE_HTML = @MAKE_HTML@
 MAKE_PDF = @MAKE_PDF@
 MAKE_PS = @MAKE_PS@
 MAKE_TEXT = @MAKE_TEXT@
-MESA_SOURCE = @MESA_SOURCE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
@@ -297,7 +315,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
@@ -307,6 +324,7 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PROJECTROOT = @PROJECTROOT@
 PS2PDF = @PS2PDF@
+Q = @Q@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -320,11 +338,10 @@ STRIP = @STRIP@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
-VENDOR_MAN_VERSION = @VENDOR_MAN_VERSION@
-VENDOR_NAME = @VENDOR_NAME@
+V = @V@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
-VENDOR_RELEASE = @VENDOR_RELEASE@
 VERSION = @VERSION@
+WINDRES = @WINDRES@
 X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
 X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
 XDMCP_CFLAGS = @XDMCP_CFLAGS@
@@ -360,6 +377,7 @@ XORG_OS_SUBDIR = @XORG_OS_SUBDIR@
 XORG_SYS_LIBS = @XORG_SYS_LIBS@
 XPBPROXY_CFLAGS = @XPBPROXY_CFLAGS@
 XPBPROXY_LIBS = @XPBPROXY_LIBS@
+XQUARTZ_SPARKLE = @XQUARTZ_SPARKLE@
 XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
 XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
 XSDL_INCS = @XSDL_INCS@
@@ -384,7 +402,6 @@ YFLAGS = @YFLAGS@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
-abi_font = @abi_font@
 abi_videodrv = @abi_videodrv@
 abi_xinput = @abi_xinput@
 abs_builddir = @abs_builddir@
@@ -407,6 +424,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
@@ -438,7 +456,9 @@ psdir = @psdir@
 sbindir = @sbindir@
 sdkdir = @sdkdir@
 sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
 srcdir = @srcdir@
+symbol_visibility = @symbol_visibility@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
@@ -455,17 +475,18 @@ top_srcdir = @top_srcdir@
 @XORG_TRUE@noinst_LTLIBRARIES = libXext.la libXextbuiltin.la libXextmodule.la
 INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
 AM_CFLAGS = $(DIX_CFLAGS)
-@XORG_TRUE@sdk_HEADERS = xvdix.h xvmcext.h geext.h geint.h shmint.h
+@XORG_TRUE@sdk_HEADERS = xvdix.h xvmcext.h geext.h geint.h shmint.h \
+@XORG_TRUE@	$(am__append_6) $(am__append_8)
 
 # Sources always included in libXextbuiltin.la & libXext.la
 BUILTIN_SRCS = bigreq.c geext.c shape.c sleepuntil.c sleepuntil.h \
-	sync.c xcmisc.c xtest.c $(am__append_1) $(am__append_5) \
-	$(am__append_6) $(am__append_8) $(am__append_9) \
-	$(am__append_11)
+	sync.c syncsrv.h xcmisc.c xtest.c $(am__append_1) \
+	$(am__append_5) $(am__append_7) $(am__append_10) \
+	$(am__append_11) $(am__append_13)
 
 # Sources always included in libXextmodule.la & libXext.la. That's right, zero.
 MODULE_SRCS = $(am__append_2) $(am__append_3) $(am__append_4) \
-	$(am__append_7) $(am__append_10) $(am__append_12)
+	$(am__append_9) $(am__append_12) $(am__append_14)
 
 # Optional sources included if extension enabled by configure.ac rules