--- Pike-v7.6.86/src/modules/_Image_FreeType/configure.in.orig	2004-01-15 02:19:14.000000000 +0100
+++ Pike-v7.6.86/src/modules/_Image_FreeType/configure.in	2006-12-23 15:25:19.215194572 +0100
@@ -10,7 +10,7 @@
 
   PIKE_FEATURE_NODEP(Image.FreeType)
 
-  MY_AC_PATH_PROG(FT_CONFIG, ${ac_tool_prefix}freetype-config, no)
+  MY_AC_PATH_PROG(FT_CONFIG, freetype-config, no)
 
   if test "$FT_CONFIG" = "no" ; then
      :
@@ -56,7 +56,12 @@
       AC_MSG_CHECKING(for ft_encoding_latin_1 declaration)
       AC_CACHE_VAL(pike_cv_decl_ft_encoding_latin_1, [
         AC_TRY_COMPILE([
+#ifdef HAVE_FT_FT2BUILD
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#else
 #include <freetype/freetype.h>
+#endif
 int q = ft_encoding_latin_1;
         ], [], [pike_cv_decl_ft_encoding_latin_1=yes
         ],[pike_cv_decl_ft_encoding_latin_1=no ])