diff options
| author | Kevin E Martin <kem@kem.org> | 2005-11-19 07:15:41 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-11-19 07:15:41 +0000 |
| commit | d48bfbaf52598d89b4b1d97b230924874175e068 (patch) | |
| tree | f33e6ddd955b70ca39405baf1fe7a7d45a69b7a1 | |
| parent | 70a8aeb19223cc6db9ff6fc1335e3ef94bbb9253 (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 | 3 | ||||
| -rw-r--r-- | xfont.pc.in | 11 |
3 files changed, 16 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * xfont.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 9420c12..e919ffc 100644 --- a/configure.ac +++ b/configure.ac @@ -86,13 +86,16 @@ if test x$XFONT_FREETYPE = xyes; then FREETYPE_CFLAGS="`$ft_config --cflags`" FREETYPE_LIBS="`$ft_config --libs`" fi + FREETYPE_REQUIRES="freetype2" XFONT_FONTFILE=yes else FREETYPE_CFLAGS="" FREETYPE_LIBS="" + FREETYPE_REQUIRES="" fi AC_SUBST(FREETYPE_LIBS) AC_SUBST(FREETYPE_CFLAGS) +AC_SUBST(FREETYPE_REQUIRES) # # A bit tricky here; CID font support uses the IBM Type1 rasterizer, diff --git a/xfont.pc.in b/xfont.pc.in index 6b70a1b..aaed29c 100644 --- a/xfont.pc.in +++ b/xfont.pc.in @@ -2,13 +2,12 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -freetypelibs=@FREETYPE_LIBS@ -mathlibs=@MATH_LIBS@ -zlibs=@Z_LIBS@ -freetypecflags=@FREETYPE_CFLAGS@ Name: Xfont Description: X font Library Version: @VERSION@ -Cflags: -I${includedir} ${freetypecflags} -Libs: -L${libdir} -lXfont ${freetypelibs} ${mathlibs} ${zlibs} +Requires: xproto fontsproto +Requires.private: fontenc @FREETYPE_REQUIRES@ +Cflags: -I${includedir} +Libs: -L${libdir} -lXfont +Libs.private: -lz -lm |