summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-11-19 07:15:43 +0000
committerKevin E Martin <kem@kem.org>2005-11-19 07:15:43 +0000
commitbf2fcad15b7bf2c505f5478648bf6ecbc0be701a (patch)
tree039658f14b549dab2ab0cf43e7d65041986588a1
parenta27c3d61d107fe4af33181a63f8ea951367ff418 (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.ac5
-rw-r--r--xrandr.pc.in6
3 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 28df1b0..27e7ce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * xrandr.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 a77d930..1903a98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ dnl try to keep these the same. Note that the library has an extra
dnl digit in the version number to track changes which don't affect the
dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
dnl
-AC_INIT(libXrandr, 0.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
+AC_INIT(libXrandr, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -52,7 +52,8 @@ AC_SUBST(X_LIBS)
# find the required protocol version
RANDR_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
-PKG_CHECK_MODULES(RANDR, randrproto >= $RANDR_VERSION xext xrender renderproto)
+AC_SUBST(RANDR_VERSION)
+PKG_CHECK_MODULES(RANDR, randrproto >= $RANDR_VERSION xext xextproto xrender renderproto)
AC_SUBST(RANDR_CFLAGS)
AC_SUBST(RANDR_LIBS)
diff --git a/xrandr.pc.in b/xrandr.pc.in
index 326f0e2..c691d17 100644
--- a/xrandr.pc.in
+++ b/xrandr.pc.in
@@ -6,5 +6,7 @@ includedir=@includedir@
Name: Xrandr
Description: X RandR Library
Version: @VERSION@
-Cflags: -I${includedir} @RANDR_CFLAGS@ @X_CFLAGS@
-Libs: -L${libdir} -lXrandr @RANDR_LIBS@ @X_LIBS@
+Requires: xproto randrproto >= @RANDR_VERSION@
+Requires.private: x11 xext xrender
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXrandr