--- Xft1/Imakefile	Fri Aug  2 12:07:39 2002
+++ Xft1/Imakefile.n	Mon Sep  2 13:53:12 2002
@@ -58,11 +58,11 @@
 #ifdef LdPreLibs
 # undef LdPreLibs
 #endif
 #define LdPreLibs -L$(BUILDLIBDIR) LdPreLib XLdPreLibs
 
-LDPRELIBS=LdPreLibs
+LDPRELIBS=LdPreLibs $(RPM_EXTRA_LIBS)
 #endif
 
 
 #define DoNormalLib NO
 #define DoSharedLib SharedLibXft1
@@ -83,11 +83,11 @@
 #define XftLibDir $(LIBDIR)
 #endif
 
 XFTLIBDIR=XftLibDir
 
-INCLUDES=$(FREETYPE2INCLUDES)
+INCLUDES=$(FREETYPE2INCLUDES) -I../fontconfig
 DEFINES=$(FREETYPE2DEFINES) $(RENDERDEFINES)
 
 #if UseFreetype2
 FREETYPE2REQLIB = $(FREETYPE2LIB)
 #endif