From 9100981d359f6366ab92b456e6069bac89afeb15 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@freedesktop.org>
Date: Mon, 25 Sep 2006 02:02:16 -0700
Subject: [PATCH] Split the Xlib compatibility functions into a separate
 library libxcb-xlib

We don't want to have to change the libxcb soname if we later manage to remove
the Xlib compatibility functions, and nothing except Xlib should ever use
them, so split them into a separate library.
---
 configure.ac    |  2 +-
 src/Makefile.am |  7 ++++++-
 xcb-xlib.pc.in  | 11 +++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 xcb-xlib.pc.in

diff --git a/configure.ac b/configure.ac
index d72677c..ff91834 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,6 +119,6 @@ AC_SUBST(CWARNFLAGS)
 GCC_CHECK_VISIBILITY()
 
 AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
-AC_CONFIG_FILES([xcb.pc xcb-composite.pc xcb-damage.pc xcb-dpms.pc xcb-glx.pc xcb-randr.pc xcb-record.pc xcb-render.pc xcb-res.pc xcb-screensaver.pc xcb-shape.pc xcb-shm.pc xcb-sync.pc xcb-xevie.pc xcb-xf86dri.pc xcb-xfixes.pc xcb-xprint.pc xcb-xtest.pc xcb-xv.pc xcb-xvmc.pc])
+AC_CONFIG_FILES([xcb.pc xcb-xlib.pc xcb-composite.pc xcb-damage.pc xcb-dpms.pc xcb-glx.pc xcb-randr.pc xcb-record.pc xcb-render.pc xcb-res.pc xcb-screensaver.pc xcb-shape.pc xcb-shm.pc xcb-sync.pc xcb-xevie.pc xcb-xf86dri.pc xcb-xfixes.pc xcb-xprint.pc xcb-xtest.pc xcb-xv.pc xcb-xvmc.pc])
 
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index f49cc38..274a884 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
 lib_LTLIBRARIES = libxcb.la \
+                  libxcb-xlib.la \
                   libxcb-composite.la \
                   libxcb-damage.la \
                   libxcb-dpms.la \
@@ -105,7 +106,7 @@ AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XAU_C
 libxcb_la_LIBADD = $(XCBPROTO_LIBS) $(XAU_LIBS) $(XDMCP_LIBS)
 libxcb_la_SOURCES = \
 		xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \
-		xcb_list.c xcb_util.c xcb_xlib.c xcb_auth.c \
+		xcb_list.c xcb_util.c xcb_auth.c \
 		$(COREPROTO) $(ESSENTIAL_EXTENSIONS) c-client.xsl
 
 # Explanation for -version-info:
@@ -122,6 +123,10 @@ CLEANFILES = $(COREPROTO) $(EXTENSIONS)
 
 XCB_LIBS = libxcb.la
 
+libxcb_xlib_la_LDFLAGS = -version-info 0:0:0
+libxcb_xlib_la_LIBADD = $(XCB_LIBS)
+libxcb_xlib_la_SOURCES = xcb_xlib.c
+
 # FIXME: find a way to autogenerate this from the XML files.
 
 libxcb_composite_la_LDFLAGS = -version-info 0:0:0
diff --git a/xcb-xlib.pc.in b/xcb-xlib.pc.in
new file mode 100644
index 0000000..f28b529
--- /dev/null
+++ b/xcb-xlib.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB Xlib
+Description: XCB Xlib support functions
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lxcb-xlib
+Cflags: -I${includedir}
-- 
2.7.4