summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-11-19 07:15:41 +0000
committerKevin E Martin <kem@kem.org>2005-11-19 07:15:41 +0000
commit4b9884c72b23b276eeb2b2e6b3c749fbb54fdc36 (patch)
tree9b3a68cf8865857db50499a17c77c88bdb476eb4
parent593a37675b72053c36924785a2fea51a06ad1c37 (diff)
downloadxorg-lib-libXfixes-4b9884c72b23b276eeb2b2e6b3c749fbb54fdc36.tar.gz
Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work with separate build roots.
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac1
-rw-r--r--xfixes.pc.in6
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 21a0653..6014151 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * xfixes.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-12 Alan Coopersmith <alan.coopersmith@sun.com>
* man/Makefile.am:
diff --git a/configure.ac b/configure.ac
index 45f6b56..45a9456 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,7 @@ AC_SUBST(X_LIBS)
# find the required protocol version
FIXESEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
+AC_SUBST(FIXESEXT_VERSION)
PKG_CHECK_MODULES(FIXESEXT, xproto [fixesproto >= $FIXESEXT_VERSION] xextproto)
AC_SUBST(FIXESEXT_CFLAGS)
AC_SUBST(FIXESEXT_LIBS)
diff --git a/xfixes.pc.in b/xfixes.pc.in
index 1c05e9b..fae0c03 100644
--- a/xfixes.pc.in
+++ b/xfixes.pc.in
@@ -6,5 +6,7 @@ includedir=@includedir@
Name: Xfixes
Description: X Fixes Library
Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @X_CFLAGS@
-Libs: -L${libdir} -lXfixes @X_LIBS@
+Requires: xproto fixesproto >= @FIXESEXT_VERSION@
+Requires.private: x11
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXfixes