diff options
| author | Kevin E Martin <kem@kem.org> | 2005-11-19 07:15:35 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-11-19 07:15:35 +0000 |
| commit | ff0494da73f7375ef051621c72f6ce91a101574a (patch) | |
| tree | 8367f51efdfb82228804ad065b3a65ac92544813 | |
| parent | cf92d3afb96be73691967875a1e659bfaf47bd5d (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 | 6 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 3 |
3 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * Makefile.am: + * configure.ac: + Update dependencies to work with separate build roots. + 2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/Makefile.am b/Makefile.am index d92b26a..84df775 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = mkfontscale -mkfontscale_CFLAGS = @MKFONTSCALE_CFLAGS@ -D_BSD_SOURCE +mkfontscale_CFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE mkfontscale_LDADD = @MKFONTSCALE_LIBS@ mkfontscale_SOURCES = \ diff --git a/configure.ac b/configure.ac index 3e34926..a6eb612 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,9 @@ PKG_CHECK_MODULES(MKFONTSCALE, fontenc freetype2) AC_SUBST(MKFONTSCALE_CFLAGS) AC_SUBST(MKFONTSCALE_LIBS) +PKG_CHECK_MODULES(X11, x11) +AC_SUBST(X11_CFLAGS) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |