-document that you don't want the FT2 freetype.h in the include path

diff --git a/Changes b/Changes
index 92dc882cf5982f49ac0a4e581f6a0e9427eb7844..f6ae99d147fd4d6d6dfe09d7641181b2ac9b4348 100644 (file)
--- a/Changes
+++ b/Changes
@@ -955,9 +955,11 @@ Revision history for Perl extension Imager.
   locations first, so that those directories are searched before
   the freetype1 directories.  This prevents problems compiling
   font.c on FreeBSD.
+  Resolves: http://rt-cpan.fsck.com/Ticket/Display.html?id=1723
 - finish off a sentence in the "Producing an image from a CGI script"
   example in Imager::Files
 - method index didn't include errstr()
+- document that you don't want the FT2 freetype.h in the include path
 
 =================================================================
 

diff --git a/README b/README
index d2e626149a94aaefc77336f613157efe1bb69695..4918d0aa5793f7fb681e5efe8b19f131430d65f7 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 ================================================================
-Copyright (c) 1999-2001 Arnar M. Hrafnkelsson. All rights reserved.
+Copyright (c) 1999-2004 Arnar M. Hrafnkelsson. All rights reserved.
 Copyright (c) 2004 Anthony Cook.
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
@@ -88,7 +88,7 @@ included since libgif has been linked with it).
 Otherwise you could just build giflib without any X11 dependencies:
 
   # must be a clean tree
-  cd giflib-4.1.0
+  cd giflib-4.1.3
   ./configure --without-x ...
 
 Also note that libgif has a few bugs: You can run something like
@@ -119,10 +119,27 @@ $ IM_MANUAL=1 perl Makefile.PL
 and simply say no to tiff support when asked if you want it, the same thing
 can be used to circumvent problems in gifs to get Imager going.
 
-
 If it worked just continue with the installation as normally 
 (with make install).
 
+Freetype 1.x vs Freetype 2.x
+----------------------------
+
+These two libraries have some conflicting include file names, but as
+long as you don't put the Freetype 2.x freetype.h directory in the
+include path it should all work.
+
+Put the directory containing ft2build.h in the include path, but not
+the directory containing the freetype 2.x freetype.h.
+
+If you see compilation errors from font.c you've probably made the
+mistake of putting the Freetype 2.x freetype.h directory into the
+include path.
+
+To see which directories should be in the include path, try:
+
+  freetype-config --cflags
+
 ========================
 3. External dependencies
 ========================
@@ -165,6 +182,7 @@ At the time of writing you will need to manually select to install the
 
    t1: http://www.ibiblio.org/pub/Linux/libs/graphics/
 
+freetype2 or
    tt: http://www.freetype.org/
 
 Precompiled versions of some of the libraries might be found at: