Update pkgconfig files to separate library build-time dependencies from application build-time dependencies, and update package deps to work with separate build roots.

3 files changed, 18 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index d2e55bb..e5c27da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-19  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* x11.pc.in:
+	Update pkgconfig files to separate library build-time dependencies
+	from application build-time dependencies.
+	* configure.ac:
+	Update dependencies to work with separate build roots.
+
 2005-11-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index bcb122d..74bf725 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,11 +280,15 @@ AM_CONDITIONAL(MANPAGES, [ test x$LIBMAN '!=' xno ])
 
 AM_CONDITIONAL(XKB, [ test x$XKB = xyes ])
 if test x"$XKB" = "xyes"; then
-   PKG_CHECK_MODULES(XKBPROTO, kbproto inputproto)
+   XKBPROTO_REQUIRES="kbproto inputproto"
+   PKG_CHECK_MODULES(XKBPROTO, $XKBPROTO_REQUIRES)
    AC_DEFINE(XKB,1,[Use XKB])
    X11_CFLAGS="$X11_CFLAGS $XKBPROTO_CFLAGS"
    X11_LIBS="$X11_LIBS $XKBPROTO_LIBS"
+else
+   XKBPROTO_REQUIRES=""
 fi
+AC_SUBST(XKBPROTO_REQUIRES)
 
 if test "x$GCC" = "xyes"; then
 	GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
diff --git a/x11.pc.in b/x11.pc.in
index c9ff11d..ee3c097 100644
--- a/x11.pc.in
+++ b/x11.pc.in
@@ -8,5 +8,8 @@ xthreadlib=@XTHREADLIB@
 Name: X11
 Description: X Library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lX11 @XPROTO_LIBS@ @LIBS@
-Cflags: -I${includedir} @XPROTO_CFLAGS@ @XTHREAD_CFLAGS@
+Requires: xproto @XKBPROTO_REQUIRES@
+Requires.private: xau xdmcp
+Cflags: -I${includedir} @XTHREAD_CFLAGS@
+Libs: -L${libdir} -lX11
+Libs.private: @XTHREADLIB@