diff options
| author | Kevin E Martin <kem@kem.org> | 2005-11-01 15:11:51 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-11-01 15:11:51 +0000 |
| commit | 750cac0b61ecde7489ea98e69f60417d169329c7 (patch) | |
| tree | 12d5b0bf8cf4e6d8b42cfb4a8f9774a686063226 | |
| parent | 92f0e71679f00f6ce18f445f505962bd1c6c8141 (diff) | |
Update pkgcheck dependencies to work with separate build roots.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * configure.ac: + * src/Makefile.am: + Update pkgcheck dependencies to work with separate build roots. + 2005-10-26 Adam Jackson <ajax@freedesktop.org> * configure.ac: diff --git a/configure.ac b/configure.ac index d4d481f..530caa2 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,7 @@ AC_SUBST(X_LIBS) # find the required protocol version FIXESEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] -PKG_CHECK_MODULES(FIXESEXT, xproto [fixesproto >= $FIXESEXT_VERSION]) +PKG_CHECK_MODULES(FIXESEXT, xproto [fixesproto >= $FIXESEXT_VERSION] xextproto) AC_SUBST(FIXESEXT_CFLAGS) AC_SUBST(FIXESEXT_LIBS) diff --git a/src/Makefile.am b/src/Makefile.am index 8521ac6..7bd9d96 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,7 +9,7 @@ libXfixes_la_SOURCES = \ Xfixesint.h libXfixes_la_LIBADD = @X_LIBS@ -AM_CFLAGS = @X_CFLAGS@ +AM_CFLAGS = @X_CFLAGS@ @FIXESEXT_CFLAGS@ INCLUDES = -I$(top_srcdir)/include/X11/extensions |