frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

This commit is contained in:
Jamey Sharp 2006-11-22 20:29:04 -08:00
parent 3de6ab7b78
commit e54dfd73a9
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -31,12 +31,14 @@ AC_SUBST(HTML_CHECK_RESULT)
# Checks for pkg-config packages # Checks for pkg-config packages
PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 0.9.93) 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, PKG_CHECK_MODULES(XDMCP, xdmcp,
AC_CHECK_LIB(Xdmcp, XdmcpWrap, AC_CHECK_LIB(Xdmcp, XdmcpWrap,
[ [
AC_DEFINE(HASXDMAUTH,1,[Has Wraphelp.c needed for XDM AUTH protocols]) AC_DEFINE(HASXDMAUTH,1,[Has Wraphelp.c needed for XDM AUTH protocols])
NEEDED="$NEEDED xdmcp"
], ],
[ [
XDMCP_CFLAGS= XDMCP_CFLAGS=
@ -44,6 +46,8 @@ PKG_CHECK_MODULES(XDMCP, xdmcp,
], [$XDMCP_LIBS]), ], [$XDMCP_LIBS]),
[AC_MSG_RESULT(no)]) [AC_MSG_RESULT(no)])
AC_SUBST(NEEDED)
# Find the xcb-proto protocol descriptions # Find the xcb-proto protocol descriptions
AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR) AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)
XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto` XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto`

4
src/Makefile.am
View File

@ -94,8 +94,8 @@ EXTENSION_XML = xproto.xml \
xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(EXTHEADERS) xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(EXTHEADERS)
noinst_HEADERS = xcbint.h noinst_HEADERS = xcbint.h
AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XAU_CFLAGS) $(XDMCP_CFLAGS) AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(NEEDED_CFLAGS) $(XDMCP_CFLAGS)
libxcb_la_LIBADD = $(XCBPROTO_LIBS) $(XAU_LIBS) $(XDMCP_LIBS) libxcb_la_LIBADD = $(XCBPROTO_LIBS) $(NEEDED_LIBS) $(XDMCP_LIBS)
libxcb_la_SOURCES = \ libxcb_la_SOURCES = \
xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \ 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 \ xcb_list.c xcb_util.c xcb_auth.c c-client.xsl \

2
xcb.pc.in
View File

@ -6,7 +6,7 @@ includedir=@includedir@
Name: XCB Name: XCB
Description: X-protocol C Binding Description: X-protocol C Binding
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Requires.private: xau Requires.private: @NEEDED@
Libs: -L${libdir} -lxcb Libs: -L${libdir} -lxcb
Libs.private: @LIBS@ Libs.private: @LIBS@
Cflags: -I${includedir} Cflags: -I${includedir}