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
commit5805e223e70e84d07f9203ae30effcbbc40746a6 (patch)
tree7f7fa24c792873c7ee6f971741611b280931650f
parent48527807411901e1d6806a2c9e8a84e1fa684042 (diff)
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--xdamage.pc.in6
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 15f41eb..4350c57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * xdamage.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-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 1e625a0..6968814 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,7 @@ fi
# find the required protocol version
DAMAGEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
+AC_SUBST(DAMAGEEXT_VERSION)
PKG_CHECK_MODULES(XDAMAGE, [damageproto >= $DAMAGEEXT_VERSION] xfixes fixesproto xextproto)
AC_SUBST(XDAMAGE_CFLAGS)
diff --git a/xdamage.pc.in b/xdamage.pc.in
index e11691f..3fab73f 100644
--- a/xdamage.pc.in
+++ b/xdamage.pc.in
@@ -6,5 +6,7 @@ includedir=@includedir@
Name: Xdamage
Description: X Damage Library
Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @XDAMAGE_CFLAGS@ @X_CFLAGS@
-Libs: -L${libdir} -lXdamage @XDAMAGE_LIBS@ @X_LIBS@
+Requires: xproto damageproto >= @DAMAGEEXT_VERSION@ xfixes
+Requires.private: x11 xfixes
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXdamage