From 229ba0708073b0d02ab253290f224a91844f1b17 Mon Sep 17 00:00:00 2001
From: "Bernhard R. Link" <brlink@debian.org>
Date: Wed, 28 May 2008 18:59:57 +0200
Subject: Only check for xft.pc if xft is not disabled. If xft is explicitly
 requested, not finding it causes an error. The CPP and LD flags for the
 different libraries are put in specific variables and only added in the
 Makefile.

---
 src/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 64e7163..715c47b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,6 +22,9 @@
 bin_PROGRAMS		= ratpoison
 MAINTAINERCLEANFILES = Makefile.in config.h.in
 
+AM_LDFLAGS=${X_LDFLAGS} ${X_LIBS} ${X_EXTRA_LIBS} ${XFT_LIBS} ${HISTORY_LIBS}
+AM_CPPFLAGS=${X_CFLAGS} ${XFT_CFLAGS}
+
 ratpoison_SOURCES	= actions.c		\
 			actions.h		\
 			bar.c			\
-- 
cgit v1.2.3