From c2874804715f99c6c735079cc018db77494ba0cd Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Sat, 19 Nov 2005 07:15:43 +0000 Subject: Update pkgconfig files to separate library build-time dependencies from application build-time dependencies, and update package deps to work with separate build roots. --- ChangeLog | 8 ++++++++ configure.ac | 1 + xrender.pc.in | 7 ++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30b6d91..b8fc799 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-11-19 Kevin E. Martin + + * xrender.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-07-08 Keith Packard * .cvsignore: diff --git a/configure.ac b/configure.ac index 970ad2f..f9c18dd 100644 --- a/configure.ac +++ b/configure.ac @@ -60,6 +60,7 @@ if test "$VERSION" = "" ; then VERSION=$PACKAGE_VERSION; fi RENDER_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] +AC_SUBST(RENDER_VERSION) PKG_CHECK_MODULES(RENDER, renderproto >= $RENDER_VERSION) AC_SUBST(RENDER_CFLAGS) diff --git a/xrender.pc.in b/xrender.pc.in index 5cc898b..dd30ce9 100644 --- a/xrender.pc.in +++ b/xrender.pc.in @@ -6,6 +6,7 @@ includedir=@includedir@ Name: Xrender Description: X Render Library Version: @VERSION@ -Requires: @X_REQUIRES@ -Cflags: -I${includedir} @RENDER_CFLAGS@ @X_NON_PKG_CFLAGS@ -Libs: -L${libdir} -lXrender @X_NON_PKG_LIBS@ +Requires: xproto renderproto >= @RENDER_VERSION@ x11 +Requires.private: x11 +Cflags: -I${includedir} +Libs: -L${libdir} -lXrender -- cgit v1.2.1