diff options
| author | Kevin E Martin <kem@kem.org> | 2005-11-14 22:02:13 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-11-14 22:02:13 +0000 |
| commit | a27c3d61d107fe4af33181a63f8ea951367ff418 (patch) | |
| tree | b0592d9b4f164aca9f7e73b4138f44cddc59df23 | |
| parent | 1d690983d20e3d874b7f0e7f430e3d0cf2710c53 (diff) | |
Fix pkgconfig deps for separate build roots.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2005-11-14 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * configure.ac: + * src/Makefile.am: + Fix pkgconfig deps for 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 b52c133..a77d930 100644 --- a/configure.ac +++ b/configure.ac @@ -44,13 +44,17 @@ AC_PROG_CC AC_PROG_LIBTOOL # Check for X -PKG_CHECK_MODULES(X, x11 xext xrender randrproto) +PKG_CHECK_MODULES(X, x11) +AC_SUBST(X_CFLAGS) +AC_SUBST(X_LIBS) # Check randr configuration, strip extra digits from package version to # find the required protocol version RANDR_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] PKG_CHECK_MODULES(RANDR, randrproto >= $RANDR_VERSION xext xrender renderproto) +AC_SUBST(RANDR_CFLAGS) +AC_SUBST(RANDR_LIBS) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION diff --git a/src/Makefile.am b/src/Makefile.am index 55c1457..25acc8d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,8 +4,8 @@ libXrandr_la_SOURCES = \ Xrandr.c \ Xrandrint.h -libXrandr_la_LIBADD = @X_LIBS@ -AM_CFLAGS = @X_CFLAGS@ +libXrandr_la_LIBADD = @X_LIBS@ @RANDR_LIBS@ +AM_CFLAGS = @X_CFLAGS@ @RANDR_CFLAGS@ INCLUDES = -I$(top_srcdir)/include/X11/extensions |