From a6fbdb403efd3bf7e1179660959fd0e66a301ce0 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Sat, 19 Nov 2005 07:15:42 +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 | 2 +- xpm.pc.in | 6 ++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9cdba90..4fd1003 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-11-19 Kevin E. Martin + + * xpm.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-12 Alan Coopersmith * configure.ac: diff --git a/configure.ac b/configure.ac index 9bf426f..c44bd87 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,7 @@ if test x$STAT_ZFILE = xyes ; then AC_DEFINE(STAT_ZFILE, 1, [Define to 1 to automatically look for files with .Z & .gz extensions]) fi -PKG_CHECK_MODULES(SXPM, xt xext, build_sxpm=true, build_sxpm=false) +PKG_CHECK_MODULES(SXPM, xt xext xextproto, build_sxpm=true, build_sxpm=false) AM_CONDITIONAL(BUILD_SXPM, test x$build_sxpm = xtrue) diff --git a/xpm.pc.in b/xpm.pc.in index b666e53..e7be72f 100644 --- a/xpm.pc.in +++ b/xpm.pc.in @@ -6,5 +6,7 @@ includedir=@includedir@ Name: Xpm Description: X Pixmap Library Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lXpm @XPM_LIBS@ @LIBS@ -Cflags: -I${includedir} @XPM_CFLAGS@ +Requires: x11 +Requires.private: x11 +Cflags: -I${includedir} +Libs: -L${libdir} -lXpm -- cgit v1.2.1