Index: xc/lib/font/util/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/font/util/Imakefile,v
retrieving revision 1.3
diff -u -2 -0 -r1.3 Imakefile
--- xc/lib/font/util/Imakefile	27 Aug 2004 19:27:11 -0000	1.3
+++ xc/lib/font/util/Imakefile	9 Nov 2004 10:58:39 -0000
@@ -2,46 +2,46 @@
 
 
 
 
 XCOMM $XFree86: xc/lib/font/util/Imakefile,v 1.6 2000/12/07 16:40:30 dawes Exp $
 
 #include <Server.tmpl>
 
         INCLUDES = -I$(FONTINCSRC) -I../include
          HEADERS = 
 #ifdef FontFormatDefines
      FORMAT_DEFS = FontFormatDefines
 #endif
 
 #if defined(SunArchitecture) && (OSMajorVersion == 5) && (OSMinorVersion <= 6)
     /* Work around a problem with __ctype being a "relocation against
        allocatable but non-writable section" on Solaris 2.6.  Hopefully
        it doesn't break anything. */
      SYS_DEFINES = -D__XPG4_CHAR_CLASS__
 #endif
-#ifndef LynxOSArchitecture
+#if 0 /* no longer needed with Freetype V2.1.8 */
 /* 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 && !SharedLibFreetype2
+#if (NormalLibFreetype2 == YES) && (SharedLibFreetype2 == NO)
 INTERNALDEFINES = -DUSE_INTERNAL_FREETYPE
 #endif
 #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
 
             OBJS = utilbitmap.o fontnames.o fontutil.o fontxlfd.o format.o \
 		   fontaccel.o atom.o miscutil.o private.o patcache.o
 
 #define DoNormalLib NormalLibFont
 #define DoSharedLib SharedLibFont
 #define DoDebugLib DebugLibFont
 #define DoProfileLib ProfileLibFont
 #include <Library.tmpl>
 LibraryObjectRule()