summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-11-01 15:11:50 +0000
committerKevin E Martin <kem@kem.org>2005-11-01 15:11:50 +0000
commit3e53ff688524152ea26436b9a5797d9a10647844 (patch)
tree56c92b2046d32e196e6d2f1a81049e6c6ffc08fa
parentc9df69c6197623623d5c7d444181cfaddb9b23bb (diff)
downloadxorg-lib-libXRes-3e53ff688524152ea26436b9a5797d9a10647844.tar.gz
Update pkgcheck dependencies to work with separate build roots.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am2
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 71f5b5e..795f6c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index bea3d75..6bb76dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,7 @@ AC_PROG_LIBTOOL
# get modules
PKG_CHECK_MODULES(XRES, x11 xext)
+AC_SUBST(XRES_CFLAGS)
AC_SUBST(XRES_LIBS)
# Check xres configuration, strip extra digits from package version to
diff --git a/src/Makefile.am b/src/Makefile.am
index 5051518..9128aee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ libXRes_la_SOURCES = \
libXRes_la_LIBADD = @RESOURCEEXT_LIBS@ @XRES_LIBS@
-AM_CFLAGS = @RESOURCEEXT_CFLAGS@
+AM_CFLAGS = @RESOURCEEXT_CFLAGS@ @XRES_CFLAGS@
INCLUDES = -I$(top_srcdir)/include