[Xcb-commit] 2 commits - configure.ac src xcb.pc.in

[Jamey Sharp]

 configure.ac    |    6 +++++-
 src/Makefile.am |    4 ++--
 xcb.pc.in       |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
diff-tree 183c2ba4cca71f4b12f106f801f0bd30c4c527f1 (from e54dfd73a9652bbc103f3f874abc303aed4b5d76)
Author: Jamey Sharp <jamey at minilop.net>
Date:   Wed Nov 22 21:27:41 2006 -0800

    xcb-proto has no libraries or headers, so don't use XCBPROTO_CFLAGS or XCBPROTO_LIBS.

diff --git a/src/Makefile.am b/src/Makefile.am
index d16d9a6..e8dc4cc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,8 +94,8 @@ EXTENSION_XML = xproto.xml \
 xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(EXTHEADERS)
 noinst_HEADERS = xcbint.h
 
-AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(NEEDED_CFLAGS) $(XDMCP_CFLAGS)
-libxcb_la_LIBADD = $(XCBPROTO_LIBS) $(NEEDED_LIBS) $(XDMCP_LIBS)
+AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(NEEDED_CFLAGS) $(XDMCP_CFLAGS)
+libxcb_la_LIBADD = $(NEEDED_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_auth.c c-client.xsl \
diff-tree e54dfd73a9652bbc103f3f874abc303aed4b5d76 (from 3de6ab7b786775d9e7df1523c27cdfe3ffd3a25f)
Author: Jamey Sharp <jamey at minilop.net>
Date:   Wed Nov 22 20:29:04 2006 -0800

    Use pthread-stubs as needed, and list xdmcp in Requires.private when XCB is built to use it.

diff --git a/configure.ac b/configure.ac
index a831f34..fa49f9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,12 +31,14 @@ AC_SUBST(HTML_CHECK_RESULT)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 0.9.93)
-PKG_CHECK_MODULES(XAU, xau)
+NEEDED="xau pthread-stubs"
+PKG_CHECK_MODULES(NEEDED, $NEEDED)
 
 PKG_CHECK_MODULES(XDMCP, xdmcp,
 	AC_CHECK_LIB(Xdmcp, XdmcpWrap,
 		[
 		AC_DEFINE(HASXDMAUTH,1,[Has Wraphelp.c needed for XDM AUTH protocols])
+		NEEDED="$NEEDED xdmcp"
 		],
 		[
 		XDMCP_CFLAGS=
@@ -44,6 +46,8 @@ PKG_CHECK_MODULES(XDMCP, xdmcp,
 		], [$XDMCP_LIBS]),
 	[AC_MSG_RESULT(no)])
 
+AC_SUBST(NEEDED)
+
 # Find the xcb-proto protocol descriptions
 AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)
 XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
diff --git a/src/Makefile.am b/src/Makefile.am
index adcfc98..d16d9a6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,8 +94,8 @@ EXTENSION_XML = xproto.xml \
 xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(EXTHEADERS)
 noinst_HEADERS = xcbint.h
 
-AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XAU_CFLAGS) $(XDMCP_CFLAGS)
-libxcb_la_LIBADD = $(XCBPROTO_LIBS) $(XAU_LIBS) $(XDMCP_LIBS)
+AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(NEEDED_CFLAGS) $(XDMCP_CFLAGS)
+libxcb_la_LIBADD = $(XCBPROTO_LIBS) $(NEEDED_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_auth.c c-client.xsl \
diff --git a/xcb.pc.in b/xcb.pc.in
index d2b5ec6..69a335c 100644
--- a/xcb.pc.in
+++ b/xcb.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: XCB
 Description: X-protocol C Binding
 Version: @PACKAGE_VERSION@
-Requires.private: xau
+Requires.private: @NEEDED@
 Libs: -L${libdir} -lxcb
 Libs.private: @LIBS@
 Cflags: -I${includedir}