put the default FreeBSD FT1 header locations after the FT2 locations

in our default include search list.

diff --git a/Changes b/Changes
index 5c01a10e764b6d51bb94aaeda235558a91e623ff..063788c6fb23ac0f6348ee90709b6f7e18270394 100644 (file)
--- a/Changes
+++ b/Changes
@@ -948,6 +948,14 @@ Revision history for Perl extension Imager.
   I'll leave it out.
 - built 0.43_03 for testing
 
+0.44
+- modify the default include directories list to include the location
+  FreeBSD keeps freetype1 headers after the freetype2 locations.
+  This ensures that the -I options are generated with freetype2
+  locations first, so that those directories are searched before
+  the freetype1 directories.  This prevents problems compiling
+  font.c on FreeBSD.
+
 =================================================================
 
         For latest versions check the Imager-devel pages:

diff --git a/Makefile.PL b/Makefile.PL
index 699596b8ed1bcf8e3e57d77488e3be4e5cbc42c8..69f807190cd5102ffa65dfe0af92a81cb79fc94d 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -274,7 +274,10 @@ sub init {
 
   @definc{'/usr/include'}=();
   @incs=(split(/\Q$Config{path_sep}/, $INCPATH), 
-         qw(/sw/include /usr/include/freetype2 /usr/local/include/freetype2 
+         qw(/sw/include 
+            /usr/include/freetype2
+            /usr/local/include/freetype2
+            /usr/local/include/freetype1/freetype
             /usr/include /usr/local/include /usr/include/freetype 
             /usr/local/include/freetype));
   @libs=(split(/\Q$Config{path_sep}/,$LIBPATH),