summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Bender <pebender@gmail.com>2009-03-12 17:11:42 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-03-12 17:11:42 -0700
commit7b9c543e7210c7da204871c31a160e79d3a949b6 (patch)
tree227c636a3e8055eecb6861af663884b63e0fab12
parentfd2cf1ef66c2aff3dc758956c9e9e567b9892c06 (diff)
Bug 15664: xau & xdmcp not needed in x11.pc dependencies when built with xcb
X.Org bug #15664 <https://bugs.freedesktop.org/show_bug.cgi?id=15664> Patch #16128 <https://bugs.freedesktop.org/attachment.cgi?id=16128> Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-rw-r--r--configure.ac1
-rw-r--r--x11.pc.in2
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 0076a8b8..afcf02a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,7 @@ AC_SUBST(XPROTO_CFLAGS)
case "$ac_cv_use_xcb" in
no)
X11_REQUIRES="xau xcmiscproto bigreqsproto"
+ X11_EXTRA_DEPS="xau xdmcp"
PKG_CHECK_MODULES(XDMCP, xdmcp)
AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$XDMCP_LIBS])
AC_DEFINE(USE_XCB, 0, [Use XCB for low-level protocol implementation])
diff --git a/x11.pc.in b/x11.pc.in
index d10c6f10..25c7e7cd 100644
--- a/x11.pc.in
+++ b/x11.pc.in
@@ -9,7 +9,7 @@ Name: X11
Description: X Library
Version: @PACKAGE_VERSION@
Requires: xproto @XKBPROTO_REQUIRES@
-Requires.private: xau xdmcp @X11_EXTRA_DEPS@
+Requires.private: @X11_EXTRA_DEPS@
Cflags: -I${includedir} @XTHREAD_CFLAGS@
Libs: -L${libdir} -lX11
Libs.private: @XTHREADLIB@