diff options
| author | Kevin E Martin <kem@kem.org> | 2005-11-19 07:15:40 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-11-19 07:15:40 +0000 |
| commit | 88e068f78c24861599829364b393ebb8b0eb6711 (patch) | |
| tree | 3661a0f447bf476e75067c123536de2075331cc9 | |
| parent | 5c429e965d88711a836227b65ab4ef2dc4739932 (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-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | xcomposite.pc.in | 6 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * xcomposite.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 95e96c0..b1c2257 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,7 @@ if test "$VERSION" = "" ; then VERSION=$PACKAGE_VERSION; fi COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] +AC_SUBST(COMPOSITEEXT_VERSION) PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11 xfixes xext fixesproto) AC_SUBST(XCOMPOSITE_CFLAGS) AC_SUBST(XCOMPOSITE_LIBS) diff --git a/xcomposite.pc.in b/xcomposite.pc.in index 0f63312..18c2a12 100644 --- a/xcomposite.pc.in +++ b/xcomposite.pc.in @@ -6,5 +6,7 @@ includedir=@includedir@ Name: Xcomposite Description: X Composite Library Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@ -Libs: -L${libdir} -lXcomposite @XCOMPOSITE_LIBS@ +Requires: xproto compositeproto >= @COMPOSITEEXT_VERSION@ xfixes +Requires.private: x11 xfixes xext +Cflags: -I${includedir} +Libs: -L${libdir} -lXcomposite |