Fix up support for building Xft1, Xrender and fontconfig out of the tree

diff --git a/fc-list/Imakefile b/fc-list/Imakefile
index 13a1280c1f8140a53d832144c648c0748419ce3a..d4016dbdc6776496d795eb2e0946df2336a8f91a 100644 (file)
--- a/fc-list/Imakefile
+++ b/fc-list/Imakefile
@@ -1,3 +1,8 @@
+#ifdef UseInstalled
+/* building outside the tree, use private defines */
+#include "../local.def"
+#endif
+
 INCLUDES=$(FREETYPE2INCLUDES) $(LIBXML2INCLUDES) -I..
 
 LOCAL_LIBRARIES=FontconfigClientLibs

diff --git a/local.def b/local.def
index 483dd76904ffce4fab76efedf7c0f717cfa4596f..aea4212a8ccde5a765a334b6e7d361220345d873 100644 (file)
--- a/local.def
+++ b/local.def
@@ -26,6 +26,20 @@
 #define _Use    _FUse
 #define _UseCat _FUseCat
 
+#ifndef ExpatClientLibs
+#define ExpatClientLibs -lexpat
+#endif
+#ifndef ExpatClientDepLibs
+#define ExpatClientDepLibs
+#endif
+
+#ifndef FontconfigClientDepLibs
+#define FontconfigClientDepLibs $(DEPFONTCONFIGLIB) $(DEPFREETYPE2LIB) ExpatClientDepLibs
+#endif
+#ifndef FontconfigClientLibs
+#define FontconfigClientLibs $(FONTCONFIGLIB) $(FREETYPE2LIB) ExpatClientLibs
+#endif
+
 #if SharedLibFontconfig
 #define SharedFontconfigRev 1.0
 SharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGSRC),SOXLIBREV,SharedFontconfigRev)