Index: xc/config/cf/xprint_site.def
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Attic/xprint_site.def,v
retrieving revision 1.1.2.7
diff -u -r1.1.2.7 xprint_site.def
--- a/xc/config/cf/xprint_site.def	17 Apr 2004 02:34:47 -0000	1.1.2.7
+++ b/xc/config/cf/xprint_site.def	20 Apr 2004 02:46:40 -0000
@@ -120,7 +120,11 @@
 #define XF86Server                     NO
 #define XnestServer                    NO
 #define XVirtualFramebufferServer      NO
+
 #define BuildFreetype2Library          YES
+#define SharedLibFreetype2             NO
+#define NormalLibFreetype2             YES
+
 #define HasFreetype2                   NO
 #define BuildXTrueType                 NO
 #define BuildType1                     NO
Index: xc/lib/font/util/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/font/util/Imakefile,v
retrieving revision 1.1.4.1.6.1
diff -u -r1.1.4.1.6.1 Imakefile
--- a/xc/lib/font/util/Imakefile	4 Mar 2004 17:47:13 -0000	1.1.4.1.6.1
+++ b/xc/lib/font/util/Imakefile	20 Apr 2004 02:46:46 -0000
@@ -19,7 +19,16 @@
        it doesn't break anything. */
      SYS_DEFINES = -D__XPG4_CHAR_CLASS__
 #endif
-         DEFINES = StrcasecmpDefines $(SYS_DEFINES)
+/* See xc/lib/font/FreeType/Imakefile - if we build the internal version of
+ * FreeType we should not implement functions already defined by it
+ * (see http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=513)
+ */
+#if !HasFreetype2
+INTERNALDEFINES = -DUSE_INTERNAL_FREETYPE
+#endif
+
+
+         DEFINES = StrcasecmpDefines $(SYS_DEFINES) $(INTERNALDEFINES)
 
             SRCS = utilbitmap.c fontnames.c fontutil.c fontxlfd.c format.c \
 		   fontaccel.c atom.c miscutil.c private.c patcache.c
Index: xc/lib/font/util/utilbitmap.c
===================================================================
RCS file: /cvs/xorg/xc/lib/font/util/utilbitmap.c,v
retrieving revision 1.1.4.1.6.1
diff -u -r1.1.4.1.6.1 utilbitmap.c
--- a/xc/lib/font/util/utilbitmap.c	4 Mar 2004 17:47:13 -0000	1.1.4.1.6.1
+++ b/xc/lib/font/util/utilbitmap.c	20 Apr 2004 02:46:46 -0000
@@ -27,6 +27,8 @@
 */
 /* $XFree86: xc/lib/font/util/utilbitmap.c,v 1.4 2001/01/17 19:43:34 dawes Exp $ */
 
+#ifndef USE_INTERNAL_FREETYPE
+
 /*
  * Author:  Keith Packard, MIT X Consortium
  */
@@ -181,3 +183,6 @@
     }
     return dstWidthBytes * height;
 }
+
+#endif /* !USE_INTERNAL_FREETYPE */
+