svn merge ^/branches/released

4 files changed, 212 insertions, 131 deletions

diff --git a/libxcb/src/Makefile.am b/libxcb/src/Makefile.am
index 5de3b09f3..8bec61387 100644
--- a/libxcb/src/Makefile.am
+++ b/libxcb/src/Makefile.am
@@ -24,7 +24,7 @@ nodist_libxcb_la_SOURCES = xproto.c bigreq.c xc_misc.c
 # * If you add an interface, increment current and age and set revision to 0.
 # * If you change or remove an interface, increment current and set revision
 #   and age to 0.
-libxcb_la_LDFLAGS = -version-info 2:0:1
+libxcb_la_LDFLAGS = -version-info 2:0:1 -no-undefined
 
 XCB_LIBS = libxcb.la
 
@@ -35,7 +35,7 @@ EXTSOURCES += composite.c
 EXTENSION_XML += composite.xml
 if BUILD_COMPOSITE
 lib_LTLIBRARIES += libxcb-composite.la
-libxcb_composite_la_LDFLAGS = -version-info 0:0:0
+libxcb_composite_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_composite_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_composite_la_SOURCES = composite.c composite.h
 endif
@@ -45,7 +45,7 @@ EXTSOURCES += damage.c
 EXTENSION_XML += damage.xml
 if BUILD_DAMAGE
 lib_LTLIBRARIES += libxcb-damage.la
-libxcb_damage_la_LDFLAGS = -version-info 0:0:0
+libxcb_damage_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_damage_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_damage_la_SOURCES = damage.c damage.h
 endif
@@ -55,17 +55,27 @@ EXTSOURCES += dpms.c
 EXTENSION_XML += dpms.xml
 if BUILD_DPMS
 lib_LTLIBRARIES += libxcb-dpms.la
-libxcb_dpms_la_LDFLAGS = -version-info 0:0:0
+libxcb_dpms_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_dpms_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_dpms_la_SOURCES = dpms.c dpms.h
 endif
 
+EXTHEADERS += dri2.h
+EXTSOURCES += dri2.c
+EXTENSION_XML += dri2.xml
+if BUILD_DRI2
+lib_LTLIBRARIES += libxcb-dri2.la
+libxcb_dri2_la_LDFLAGS = -version-info 0:0:0 -no-undefined
+libxcb_dri2_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_dri2_la_SOURCES = dri2.c dri2.h
+endif
+
 EXTHEADERS += glx.h
 EXTSOURCES += glx.c
 EXTENSION_XML += glx.xml
 if BUILD_GLX
 lib_LTLIBRARIES += libxcb-glx.la
-libxcb_glx_la_LDFLAGS = -version-info 0:0:0
+libxcb_glx_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_glx_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_glx_la_SOURCES = glx.c glx.h
 endif
@@ -75,7 +85,7 @@ EXTSOURCES += randr.c
 EXTENSION_XML += randr.xml
 if BUILD_RANDR
 lib_LTLIBRARIES += libxcb-randr.la
-libxcb_randr_la_LDFLAGS = -version-info 1:0:1
+libxcb_randr_la_LDFLAGS = -version-info 1:0:1 -no-undefined
 libxcb_randr_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_randr_la_SOURCES = randr.c randr.h
 endif
@@ -85,7 +95,7 @@ EXTSOURCES += record.c
 EXTENSION_XML += record.xml
 if BUILD_RECORD
 lib_LTLIBRARIES += libxcb-record.la
-libxcb_record_la_LDFLAGS = -version-info 0:0:0
+libxcb_record_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_record_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_record_la_SOURCES = record.c record.h
 endif
@@ -95,7 +105,7 @@ EXTSOURCES += render.c
 EXTENSION_XML += render.xml
 if BUILD_RENDER
 lib_LTLIBRARIES += libxcb-render.la
-libxcb_render_la_LDFLAGS = -version-info 0:0:0
+libxcb_render_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_render_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_render_la_SOURCES = render.c render.h
 endif
@@ -105,7 +115,7 @@ EXTSOURCES += res.c
 EXTENSION_XML += res.xml
 if BUILD_RESOURCE
 lib_LTLIBRARIES += libxcb-res.la
-libxcb_res_la_LDFLAGS = -version-info 0:0:0
+libxcb_res_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_res_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_res_la_SOURCES = res.c res.h
 endif
@@ -115,7 +125,7 @@ EXTSOURCES += screensaver.c
 EXTENSION_XML += screensaver.xml
 if BUILD_SCREENSAVER
 lib_LTLIBRARIES += libxcb-screensaver.la
-libxcb_screensaver_la_LDFLAGS = -version-info 0:0:0
+libxcb_screensaver_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_screensaver_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_screensaver_la_SOURCES = screensaver.c screensaver.h
 endif
@@ -125,7 +135,7 @@ EXTSOURCES += shape.c
 EXTENSION_XML += shape.xml
 if BUILD_SHAPE
 lib_LTLIBRARIES += libxcb-shape.la
-libxcb_shape_la_LDFLAGS = -version-info 0:0:0
+libxcb_shape_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_shape_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_shape_la_SOURCES = shape.c shape.h
 endif
@@ -135,7 +145,7 @@ EXTSOURCES += shm.c
 EXTENSION_XML += shm.xml
 if BUILD_SHM
 lib_LTLIBRARIES += libxcb-shm.la
-libxcb_shm_la_LDFLAGS = -version-info 0:0:0
+libxcb_shm_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_shm_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_shm_la_SOURCES = shm.c shm.h
 endif
@@ -145,7 +155,7 @@ EXTSOURCES += sync.c
 EXTENSION_XML += sync.xml
 if BUILD_SYNC
 lib_LTLIBRARIES += libxcb-sync.la
-libxcb_sync_la_LDFLAGS = -version-info 0:0:0
+libxcb_sync_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_sync_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_sync_la_SOURCES = sync.c sync.h
 endif
@@ -155,7 +165,7 @@ EXTSOURCES += xevie.c
 EXTENSION_XML += xevie.xml
 if BUILD_XEVIE
 lib_LTLIBRARIES += libxcb-xevie.la
-libxcb_xevie_la_LDFLAGS = -version-info 0:0:0
+libxcb_xevie_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_xevie_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_xevie_la_SOURCES = xevie.c xevie.h
 endif
@@ -165,7 +175,7 @@ EXTSOURCES += xf86dri.c
 EXTENSION_XML += xf86dri.xml
 if BUILD_XFREE86_DRI
 lib_LTLIBRARIES += libxcb-xf86dri.la
-libxcb_xf86dri_la_LDFLAGS = -version-info 0:0:0
+libxcb_xf86dri_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_xf86dri_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_xf86dri_la_SOURCES = xf86dri.c xf86dri.h
 endif
@@ -175,7 +185,7 @@ EXTSOURCES += xfixes.c
 EXTENSION_XML += xfixes.xml
 if BUILD_XFIXES
 lib_LTLIBRARIES += libxcb-xfixes.la
-libxcb_xfixes_la_LDFLAGS = -version-info 0:0:0
+libxcb_xfixes_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_xfixes_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_xfixes_la_SOURCES = xfixes.c xfixes.h
 endif
@@ -185,7 +195,7 @@ EXTSOURCES += xinerama.c
 EXTENSION_XML += xinerama.xml
 if BUILD_XINERAMA
 lib_LTLIBRARIES += libxcb-xinerama.la
-libxcb_xinerama_la_LDFLAGS = -version-info 0:0:0
+libxcb_xinerama_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_xinerama_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_xinerama_la_SOURCES = xinerama.c xinerama.h
 endif
@@ -195,7 +205,7 @@ EXTSOURCES += xinput.c
 EXTENSION_XML += xinput.xml
 if BUILD_XINPUT
 lib_LTLIBRARIES += libxcb-xinput.la
-libxcb_xinput_la_LDFLAGS = -version-info 0:0:0
+libxcb_xinput_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_xinput_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_xinput_la_SOURCES = xinput.c xinput.h
 endif
@@ -205,7 +215,7 @@ EXTSOURCES += xprint.c
 EXTENSION_XML += xprint.xml
 if BUILD_XPRINT
 lib_LTLIBRARIES += libxcb-xprint.la
-libxcb_xprint_la_LDFLAGS = -version-info 0:0:0
+libxcb_xprint_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_xprint_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_xprint_la_SOURCES = xprint.c xprint.h
 endif
@@ -215,7 +225,7 @@ EXTSOURCES += xselinux.c
 EXTENSION_XML += xselinux.xml
 if BUILD_SELINUX
 lib_LTLIBRARIES += libxcb-xselinux.la
-libxcb_xselinux_la_LDFLAGS = -version-info 0:0:0
+libxcb_xselinux_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_xselinux_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_xselinux_la_SOURCES = xselinux.c xselinux.h
 endif
@@ -225,7 +235,7 @@ EXTSOURCES += xtest.c
 EXTENSION_XML += xtest.xml
 if BUILD_XTEST
 lib_LTLIBRARIES += libxcb-xtest.la
-libxcb_xtest_la_LDFLAGS = -version-info 0:0:0
+libxcb_xtest_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_xtest_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_xtest_la_SOURCES = xtest.c xtest.h
 endif
@@ -235,7 +245,7 @@ EXTSOURCES += xv.c
 EXTENSION_XML += xv.xml
 if BUILD_XV
 lib_LTLIBRARIES += libxcb-xv.la
-libxcb_xv_la_LDFLAGS = -version-info 0:0:0
+libxcb_xv_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_xv_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_xv_la_SOURCES = xv.c xv.h
 endif
@@ -245,7 +255,7 @@ EXTSOURCES += xvmc.c
 EXTENSION_XML += xvmc.xml
 if BUILD_XVMC
 lib_LTLIBRARIES += libxcb-xvmc.la
-libxcb_xvmc_la_LDFLAGS = -version-info 0:0:0
+libxcb_xvmc_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 libxcb_xvmc_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_xvmc_la_SOURCES = xvmc.c xvmc.h
 endif
diff --git a/libxcb/src/Makefile.in b/libxcb/src/Makefile.in
index 761348a35..256ebc2bc 100644
--- a/libxcb/src/Makefile.in
+++ b/libxcb/src/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,8 +18,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -36,25 +38,26 @@ host_triplet = @host@
 @BUILD_COMPOSITE_TRUE@am__append_1 = libxcb-composite.la
 @BUILD_DAMAGE_TRUE@am__append_2 = libxcb-damage.la
 @BUILD_DPMS_TRUE@am__append_3 = libxcb-dpms.la
-@BUILD_GLX_TRUE@am__append_4 = libxcb-glx.la
-@BUILD_RANDR_TRUE@am__append_5 = libxcb-randr.la
-@BUILD_RECORD_TRUE@am__append_6 = libxcb-record.la
-@BUILD_RENDER_TRUE@am__append_7 = libxcb-render.la
-@BUILD_RESOURCE_TRUE@am__append_8 = libxcb-res.la
-@BUILD_SCREENSAVER_TRUE@am__append_9 = libxcb-screensaver.la
-@BUILD_SHAPE_TRUE@am__append_10 = libxcb-shape.la
-@BUILD_SHM_TRUE@am__append_11 = libxcb-shm.la
-@BUILD_SYNC_TRUE@am__append_12 = libxcb-sync.la
-@BUILD_XEVIE_TRUE@am__append_13 = libxcb-xevie.la
-@BUILD_XFREE86_DRI_TRUE@am__append_14 = libxcb-xf86dri.la
-@BUILD_XFIXES_TRUE@am__append_15 = libxcb-xfixes.la
-@BUILD_XINERAMA_TRUE@am__append_16 = libxcb-xinerama.la
-@BUILD_XINPUT_TRUE@am__append_17 = libxcb-xinput.la
-@BUILD_XPRINT_TRUE@am__append_18 = libxcb-xprint.la
-@BUILD_SELINUX_TRUE@am__append_19 = libxcb-xselinux.la
-@BUILD_XTEST_TRUE@am__append_20 = libxcb-xtest.la
-@BUILD_XV_TRUE@am__append_21 = libxcb-xv.la
-@BUILD_XVMC_TRUE@am__append_22 = libxcb-xvmc.la
+@BUILD_DRI2_TRUE@am__append_4 = libxcb-dri2.la
+@BUILD_GLX_TRUE@am__append_5 = libxcb-glx.la
+@BUILD_RANDR_TRUE@am__append_6 = libxcb-randr.la
+@BUILD_RECORD_TRUE@am__append_7 = libxcb-record.la
+@BUILD_RENDER_TRUE@am__append_8 = libxcb-render.la
+@BUILD_RESOURCE_TRUE@am__append_9 = libxcb-res.la
+@BUILD_SCREENSAVER_TRUE@am__append_10 = libxcb-screensaver.la
+@BUILD_SHAPE_TRUE@am__append_11 = libxcb-shape.la
+@BUILD_SHM_TRUE@am__append_12 = libxcb-shm.la
+@BUILD_SYNC_TRUE@am__append_13 = libxcb-sync.la
+@BUILD_XEVIE_TRUE@am__append_14 = libxcb-xevie.la
+@BUILD_XFREE86_DRI_TRUE@am__append_15 = libxcb-xf86dri.la
+@BUILD_XFIXES_TRUE@am__append_16 = libxcb-xfixes.la
+@BUILD_XINERAMA_TRUE@am__append_17 = libxcb-xinerama.la
+@BUILD_XINPUT_TRUE@am__append_18 = libxcb-xinput.la
+@BUILD_XPRINT_TRUE@am__append_19 = libxcb-xprint.la
+@BUILD_SELINUX_TRUE@am__append_20 = libxcb-xselinux.la
+@BUILD_XTEST_TRUE@am__append_21 = libxcb-xtest.la
+@BUILD_XV_TRUE@am__append_22 = libxcb-xv.la
+@BUILD_XVMC_TRUE@am__append_23 = libxcb-xvmc.la
 subdir = src
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -67,15 +70,30 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(xcbincludedir)" \
 	"$(DESTDIR)$(xcbincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 @BUILD_COMPOSITE_TRUE@libxcb_composite_la_DEPENDENCIES = $(XCB_LIBS)
 @BUILD_COMPOSITE_TRUE@nodist_libxcb_composite_la_OBJECTS =  \
@@ -99,6 +117,13 @@ libxcb_dpms_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libxcb_dpms_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_DPMS_TRUE@am_libxcb_dpms_la_rpath = -rpath $(libdir)
+@BUILD_DRI2_TRUE@libxcb_dri2_la_DEPENDENCIES = $(XCB_LIBS)
+@BUILD_DRI2_TRUE@nodist_libxcb_dri2_la_OBJECTS = dri2.lo
+libxcb_dri2_la_OBJECTS = $(nodist_libxcb_dri2_la_OBJECTS)
+libxcb_dri2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libxcb_dri2_la_LDFLAGS) $(LDFLAGS) -o $@
+@BUILD_DRI2_TRUE@am_libxcb_dri2_la_rpath = -rpath $(libdir)
 @BUILD_GLX_TRUE@libxcb_glx_la_DEPENDENCIES = $(XCB_LIBS)
 @BUILD_GLX_TRUE@nodist_libxcb_glx_la_OBJECTS = glx.lo
 libxcb_glx_la_OBJECTS = $(nodist_libxcb_glx_la_OBJECTS)
@@ -249,6 +274,7 @@ libxcb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -261,6 +287,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 SOURCES = $(nodist_libxcb_composite_la_SOURCES) \
 	$(nodist_libxcb_damage_la_SOURCES) \
 	$(nodist_libxcb_dpms_la_SOURCES) \
+	$(nodist_libxcb_dri2_la_SOURCES) \
 	$(nodist_libxcb_glx_la_SOURCES) \
 	$(nodist_libxcb_randr_la_SOURCES) \
 	$(nodist_libxcb_record_la_SOURCES) \
@@ -282,8 +309,6 @@ SOURCES = $(nodist_libxcb_composite_la_SOURCES) \
 	$(nodist_libxcb_xvmc_la_SOURCES) $(libxcb_la_SOURCES) \
 	$(nodist_libxcb_la_SOURCES)
 DIST_SOURCES = $(libxcb_la_SOURCES)
-nodist_xcbincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-xcbincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(nodist_xcbinclude_HEADERS) $(noinst_HEADERS) \
 	$(xcbinclude_HEADERS)
 ETAGS = etags
@@ -308,6 +333,7 @@ CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOT = @DOT@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -349,6 +375,7 @@ 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@
 PKG_CONFIG = @PKG_CONFIG@
@@ -435,22 +462,22 @@ lib_LTLIBRARIES = libxcb.la $(am__append_1) $(am__append_2) \
 	$(am__append_12) $(am__append_13) $(am__append_14) \
 	$(am__append_15) $(am__append_16) $(am__append_17) \
 	$(am__append_18) $(am__append_19) $(am__append_20) \
-	$(am__append_21) $(am__append_22)
+	$(am__append_21) $(am__append_22) $(am__append_23)
 
 # FIXME: find a way to autogenerate this from the XML files.
 EXTHEADERS = xproto.h bigreq.h xc_misc.h composite.h damage.h dpms.h \
-	glx.h randr.h record.h render.h res.h screensaver.h shape.h \
-	shm.h sync.h xevie.h xf86dri.h xfixes.h xinerama.h xinput.h \
-	xprint.h xselinux.h xtest.h xv.h xvmc.h
+	dri2.h glx.h randr.h record.h render.h res.h screensaver.h \
+	shape.h shm.h sync.h xevie.h xf86dri.h xfixes.h xinerama.h \
+	xinput.h xprint.h xselinux.h xtest.h xv.h xvmc.h
 EXTSOURCES = xproto.c bigreq.c xc_misc.c composite.c damage.c dpms.c \
-	glx.c randr.c record.c render.c res.c screensaver.c shape.c \
-	shm.c sync.c xevie.c xf86dri.c xfixes.c xinerama.c xinput.c \
-	xprint.c xselinux.c xtest.c xv.c xvmc.c
+	dri2.c glx.c randr.c record.c render.c res.c screensaver.c \
+	shape.c shm.c sync.c xevie.c xf86dri.c xfixes.c xinerama.c \
+	xinput.c xprint.c xselinux.c xtest.c xv.c xvmc.c
 EXTENSION_XML = xproto.xml bigreq.xml xc_misc.xml composite.xml \
-	damage.xml dpms.xml glx.xml randr.xml record.xml render.xml \
-	res.xml screensaver.xml shape.xml shm.xml sync.xml xevie.xml \
-	xf86dri.xml xfixes.xml xinerama.xml xinput.xml xprint.xml \
-	xselinux.xml xtest.xml xv.xml xvmc.xml
+	damage.xml dpms.xml dri2.xml glx.xml randr.xml record.xml \
+	render.xml res.xml screensaver.xml shape.xml shm.xml sync.xml \
+	xevie.xml xf86dri.xml xfixes.xml xinerama.xml xinput.xml \
+	xprint.xml xselinux.xml xtest.xml xv.xml xvmc.xml
 AM_CFLAGS = $(CWARNFLAGS) $(NEEDED_CFLAGS) $(XDMCP_CFLAGS)
 libxcb_la_LIBADD = $(NEEDED_LIBS) $(XDMCP_LIBS)
 libxcb_la_SOURCES = \
@@ -466,72 +493,75 @@ nodist_libxcb_la_SOURCES = xproto.c bigreq.c xc_misc.c
 # * If you add an interface, increment current and age and set revision to 0.
 # * If you change or remove an interface, increment current and set revision
 #   and age to 0.
-libxcb_la_LDFLAGS = -version-info 2:0:1
+libxcb_la_LDFLAGS = -version-info 2:0:1 -no-undefined
 XCB_LIBS = libxcb.la
-@BUILD_COMPOSITE_TRUE@libxcb_composite_la_LDFLAGS = -version-info 0:0:0
+@BUILD_COMPOSITE_TRUE@libxcb_composite_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_COMPOSITE_TRUE@libxcb_composite_la_LIBADD = $(XCB_LIBS)
 @BUILD_COMPOSITE_TRUE@nodist_libxcb_composite_la_SOURCES = composite.c composite.h
-@BUILD_DAMAGE_TRUE@libxcb_damage_la_LDFLAGS = -version-info 0:0:0
+@BUILD_DAMAGE_TRUE@libxcb_damage_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_DAMAGE_TRUE@libxcb_damage_la_LIBADD = $(XCB_LIBS)
 @BUILD_DAMAGE_TRUE@nodist_libxcb_damage_la_SOURCES = damage.c damage.h
-@BUILD_DPMS_TRUE@libxcb_dpms_la_LDFLAGS = -version-info 0:0:0
+@BUILD_DPMS_TRUE@libxcb_dpms_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_DPMS_TRUE@libxcb_dpms_la_LIBADD = $(XCB_LIBS)
 @BUILD_DPMS_TRUE@nodist_libxcb_dpms_la_SOURCES = dpms.c dpms.h
-@BUILD_GLX_TRUE@libxcb_glx_la_LDFLAGS = -version-info 0:0:0
+@BUILD_DRI2_TRUE@libxcb_dri2_la_LDFLAGS = -version-info 0:0:0 -no-undefined
+@BUILD_DRI2_TRUE@libxcb_dri2_la_LIBADD = $(XCB_LIBS)
+@BUILD_DRI2_TRUE@nodist_libxcb_dri2_la_SOURCES = dri2.c dri2.h
+@BUILD_GLX_TRUE@libxcb_glx_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_GLX_TRUE@libxcb_glx_la_LIBADD = $(XCB_LIBS)
 @BUILD_GLX_TRUE@nodist_libxcb_glx_la_SOURCES = glx.c glx.h
-@BUILD_RANDR_TRUE@libxcb_randr_la_LDFLAGS = -version-info 1:0:1
+@BUILD_RANDR_TRUE@libxcb_randr_la_LDFLAGS = -version-info 1:0:1 -no-undefined
 @BUILD_RANDR_TRUE@libxcb_randr_la_LIBADD = $(XCB_LIBS)
 @BUILD_RANDR_TRUE@nodist_libxcb_randr_la_SOURCES = randr.c randr.h
-@BUILD_RECORD_TRUE@libxcb_record_la_LDFLAGS = -version-info 0:0:0
+@BUILD_RECORD_TRUE@libxcb_record_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_RECORD_TRUE@libxcb_record_la_LIBADD = $(XCB_LIBS)
 @BUILD_RECORD_TRUE@nodist_libxcb_record_la_SOURCES = record.c record.h
-@BUILD_RENDER_TRUE@libxcb_render_la_LDFLAGS = -version-info 0:0:0
+@BUILD_RENDER_TRUE@libxcb_render_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_RENDER_TRUE@libxcb_render_la_LIBADD = $(XCB_LIBS)
 @BUILD_RENDER_TRUE@nodist_libxcb_render_la_SOURCES = render.c render.h
-@BUILD_RESOURCE_TRUE@libxcb_res_la_LDFLAGS = -version-info 0:0:0
+@BUILD_RESOURCE_TRUE@libxcb_res_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_RESOURCE_TRUE@libxcb_res_la_LIBADD = $(XCB_LIBS)
 @BUILD_RESOURCE_TRUE@nodist_libxcb_res_la_SOURCES = res.c res.h
-@BUILD_SCREENSAVER_TRUE@libxcb_screensaver_la_LDFLAGS = -version-info 0:0:0
+@BUILD_SCREENSAVER_TRUE@libxcb_screensaver_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_SCREENSAVER_TRUE@libxcb_screensaver_la_LIBADD = $(XCB_LIBS)
 @BUILD_SCREENSAVER_TRUE@nodist_libxcb_screensaver_la_SOURCES = screensaver.c screensaver.h
-@BUILD_SHAPE_TRUE@libxcb_shape_la_LDFLAGS = -version-info 0:0:0
+@BUILD_SHAPE_TRUE@libxcb_shape_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_SHAPE_TRUE@libxcb_shape_la_LIBADD = $(XCB_LIBS)
 @BUILD_SHAPE_TRUE@nodist_libxcb_shape_la_SOURCES = shape.c shape.h
-@BUILD_SHM_TRUE@libxcb_shm_la_LDFLAGS = -version-info 0:0:0
+@BUILD_SHM_TRUE@libxcb_shm_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_SHM_TRUE@libxcb_shm_la_LIBADD = $(XCB_LIBS)
 @BUILD_SHM_TRUE@nodist_libxcb_shm_la_SOURCES = shm.c shm.h
-@BUILD_SYNC_TRUE@libxcb_sync_la_LDFLAGS = -version-info 0:0:0
+@BUILD_SYNC_TRUE@libxcb_sync_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_SYNC_TRUE@libxcb_sync_la_LIBADD = $(XCB_LIBS)
 @BUILD_SYNC_TRUE@nodist_libxcb_sync_la_SOURCES = sync.c sync.h
-@BUILD_XEVIE_TRUE@libxcb_xevie_la_LDFLAGS = -version-info 0:0:0
+@BUILD_XEVIE_TRUE@libxcb_xevie_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_XEVIE_TRUE@libxcb_xevie_la_LIBADD = $(XCB_LIBS)
 @BUILD_XEVIE_TRUE@nodist_libxcb_xevie_la_SOURCES = xevie.c xevie.h
-@BUILD_XFREE86_DRI_TRUE@libxcb_xf86dri_la_LDFLAGS = -version-info 0:0:0
+@BUILD_XFREE86_DRI_TRUE@libxcb_xf86dri_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_XFREE86_DRI_TRUE@libxcb_xf86dri_la_LIBADD = $(XCB_LIBS)
 @BUILD_XFREE86_DRI_TRUE@nodist_libxcb_xf86dri_la_SOURCES = xf86dri.c xf86dri.h
-@BUILD_XFIXES_TRUE@libxcb_xfixes_la_LDFLAGS = -version-info 0:0:0
+@BUILD_XFIXES_TRUE@libxcb_xfixes_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_XFIXES_TRUE@libxcb_xfixes_la_LIBADD = $(XCB_LIBS)
 @BUILD_XFIXES_TRUE@nodist_libxcb_xfixes_la_SOURCES = xfixes.c xfixes.h
-@BUILD_XINERAMA_TRUE@libxcb_xinerama_la_LDFLAGS = -version-info 0:0:0
+@BUILD_XINERAMA_TRUE@libxcb_xinerama_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_XINERAMA_TRUE@libxcb_xinerama_la_LIBADD = $(XCB_LIBS)
 @BUILD_XINERAMA_TRUE@nodist_libxcb_xinerama_la_SOURCES = xinerama.c xinerama.h
-@BUILD_XINPUT_TRUE@libxcb_xinput_la_LDFLAGS = -version-info 0:0:0
+@BUILD_XINPUT_TRUE@libxcb_xinput_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_XINPUT_TRUE@libxcb_xinput_la_LIBADD = $(XCB_LIBS)
 @BUILD_XINPUT_TRUE@nodist_libxcb_xinput_la_SOURCES = xinput.c xinput.h
-@BUILD_XPRINT_TRUE@libxcb_xprint_la_LDFLAGS = -version-info 0:0:0
+@BUILD_XPRINT_TRUE@libxcb_xprint_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_XPRINT_TRUE@libxcb_xprint_la_LIBADD = $(XCB_LIBS)
 @BUILD_XPRINT_TRUE@nodist_libxcb_xprint_la_SOURCES = xprint.c xprint.h
-@BUILD_SELINUX_TRUE@libxcb_xselinux_la_LDFLAGS = -version-info 0:0:0
+@BUILD_SELINUX_TRUE@libxcb_xselinux_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_SELINUX_TRUE@libxcb_xselinux_la_LIBADD = $(XCB_LIBS)
 @BUILD_SELINUX_TRUE@nodist_libxcb_xselinux_la_SOURCES = xselinux.c xselinux.h
-@BUILD_XTEST_TRUE@libxcb_xtest_la_LDFLAGS = -version-info 0:0:0
+@BUILD_XTEST_TRUE@libxcb_xtest_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_XTEST_TRUE@libxcb_xtest_la_LIBADD = $(XCB_LIBS)
 @BUILD_XTEST_TRUE@nodist_libxcb_xtest_la_SOURCES = xtest.c xtest.h
-@BUILD_XV_TRUE@libxcb_xv_la_LDFLAGS = -version-info 0:0:0
+@BUILD_XV_TRUE@libxcb_xv_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_XV_TRUE@libxcb_xv_la_LIBADD = $(XCB_LIBS)
 @BUILD_XV_TRUE@nodist_libxcb_xv_la_SOURCES = xv.c xv.h
-@BUILD_XVMC_TRUE@libxcb_xvmc_la_LDFLAGS = -version-info 0:0:0
+@BUILD_XVMC_TRUE@libxcb_xvmc_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 @BUILD_XVMC_TRUE@libxcb_xvmc_la_LIBADD = $(XCB_LIBS)
 @BUILD_XVMC_TRUE@nodist_libxcb_xvmc_la_SOURCES = xvmc.c xvmc.h
 xcbinclude_HEADERS = xcb.h xcbext.h
@@ -554,9 +584,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -574,6 +604,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 config.h: stamp-h1
 	@if test ! -f $@; then \
@@ -585,7 +616,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status src/config.h
 $(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
 
@@ -594,20 +625,24 @@ distclean-hdr:
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -624,6 +659,8 @@ libxcb-damage.la: $(libxcb_damage_la_OBJECTS) $(libxcb_damage_la_DEPENDENCIES)
 	$(libxcb_damage_la_LINK) $(am_libxcb_damage_la_rpath) $(libxcb_damage_la_OBJECTS) $(libxcb_damage_la_LIBADD) $(LIBS)
 libxcb-dpms.la: $(libxcb_dpms_la_OBJECTS) $(libxcb_dpms_la_DEPENDENCIES) 
 	$(libxcb_dpms_la_LINK) $(am_libxcb_dpms_la_rpath) $(libxcb_dpms_la_OBJECTS) $(libxcb_dpms_la_LIBADD) $(LIBS)
+libxcb-dri2.la: $(libxcb_dri2_la_OBJECTS) $(libxcb_dri2_la_DEPENDENCIES) 
+	$(libxcb_dri2_la_LINK) $(am_libxcb_dri2_la_rpath) $(libxcb_dri2_la_OBJECTS) $(libxcb_dri2_la_LIBADD) $(LIBS)
 libxcb-glx.la: $(libxcb_glx_la_OBJECTS) $(libxcb_glx_la_DEPENDENCIES) 
 	$(libxcb_glx_la_LINK) $(am_libxcb_glx_la_rpath) $(libxcb_glx_la_OBJECTS) $(libxcb_glx_la_LIBADD) $(LIBS)
 libxcb-randr.la: $(libxcb_randr_la_OBJECTS) $(libxcb_randr_la_DEPENDENCIES) 
@@ -675,6 +712,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/damage.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dpms.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dri2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glx.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/randr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/record.Plo@am__quote@
@@ -707,21 +745,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -734,37 +772,43 @@ clean-libtool:
 install-nodist_xcbincludeHEADERS: $(nodist_xcbinclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(xcbincludedir)" || $(MKDIR_P) "$(DESTDIR)$(xcbincludedir)"
-	@list='$(nodist_xcbinclude_HEADERS)'; for p in $$list; do \
+	@list='$(nodist_xcbinclude_HEADERS)'; test -n "$(xcbincludedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(nodist_xcbincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(xcbincludedir)/$$f'"; \
-	  $(nodist_xcbincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(xcbincludedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(xcbincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(xcbincludedir)" || exit $$?; \
 	done
 
 uninstall-nodist_xcbincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(nodist_xcbinclude_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(xcbincludedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(xcbincludedir)/$$f"; \
-	done
+	@list='$(nodist_xcbinclude_HEADERS)'; test -n "$(xcbincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(xcbincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(xcbincludedir)" && rm -f $$files
 install-xcbincludeHEADERS: $(xcbinclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(xcbincludedir)" || $(MKDIR_P) "$(DESTDIR)$(xcbincludedir)"
-	@list='$(xcbinclude_HEADERS)'; for p in $$list; do \
+	@list='$(xcbinclude_HEADERS)'; test -n "$(xcbincludedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(xcbincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(xcbincludedir)/$$f'"; \
-	  $(xcbincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(xcbincludedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(xcbincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(xcbincludedir)" || exit $$?; \
 	done
 
 uninstall-xcbincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(xcbinclude_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(xcbincludedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(xcbincludedir)/$$f"; \
-	done
+	@list='$(xcbinclude_HEADERS)'; test -n "$(xcbincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(xcbincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(xcbincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -778,7 +822,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -786,29 +830,34 @@ TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -829,13 +878,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -869,6 +922,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -891,6 +945,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -900,18 +956,28 @@ install-data-am: install-nodist_xcbincludeHEADERS \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -935,7 +1001,7 @@ ps-am:
 uninstall-am: uninstall-libLTLIBRARIES \
 	uninstall-nodist_xcbincludeHEADERS uninstall-xcbincludeHEADERS
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
@@ -965,6 +1031,7 @@ $(EXTHEADERS) $(EXTSOURCES): c_client.py
 
 $(EXTENSION_XML):
 	$(LN_S) -f $(XCBPROTO_XCBINCLUDEDIR)/$@ $@
+
 # 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:
diff --git a/libxcb/src/config.h.in b/libxcb/src/config.h.in
index 6e7676734..977ac8f7c 100644
--- a/libxcb/src/config.h.in
+++ b/libxcb/src/config.h.in
@@ -64,6 +64,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
diff --git a/libxcb/src/xcb_util.c b/libxcb/src/xcb_util.c
index 1ab60b9e8..db764be05 100644
--- a/libxcb/src/xcb_util.c
+++ b/libxcb/src/xcb_util.c
@@ -277,6 +277,7 @@ static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port)
         if(fd >= 0) {
             int on = 1;
             setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
+	    setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on));
 
             if (connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0)
                 break;