summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-11-19 07:15:40 +0000
committerKevin E Martin <kem@kem.org>2005-11-19 07:15:40 +0000
commit110fc9c3da409c53f2d6f638d0a137c29559cd32 (patch)
tree4e6843b51297ec0981c29e7f593d3671a423feaa
parentc6674701dade763eb2d3380755b4c23f47fa6cdb (diff)
downloadxorg-lib-libXRes-110fc9c3da409c53f2d6f638d0a137c29559cd32.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.ac2
-rw-r--r--xres.pc.in6
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 55c1946..d36465f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * xres.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 ec53086..45af00d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ AC_PROG_CC
AC_PROG_LIBTOOL
# get modules
-PKG_CHECK_MODULES(XRES, x11 xext)
+PKG_CHECK_MODULES(XRES, x11 xext xextproto)
AC_SUBST(XRES_CFLAGS)
AC_SUBST(XRES_LIBS)
diff --git a/xres.pc.in b/xres.pc.in
index cad7b72..abbb4b6 100644
--- a/xres.pc.in
+++ b/xres.pc.in
@@ -6,5 +6,7 @@ includedir=@includedir@
Name: XRes
Description: X Resource Information Extension Library
Version: @VERSION@
-Cflags: -I${includedir} @RESOURCEEXT_CFLAGS@ @XRES_CFLAGS@
-Libs: -L${libdir} -lXRes @RESOURCEEXT_LIBS@ @XRES_LIBS@
+Requires: xproto
+Requires.private: x11 xext
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXRes