Include ft2build.h before freetype/freetype.h. Libfreetype 2.1.7

requires this.

configure

@@ -9329,7 +9329,9 @@ fi
 
 
 
-for ac_header in freetype/freetype.h \
+
+for ac_header in ft2build.h \
+                         freetype/freetype.h \
                          freetype/ftglyph.h \
                          freetype/tttables.h \
                          freetype/ftnames.h \

configure.ac

@@ -447,7 +447,8 @@ else
 	FREETYPEINCL=`$ft_devel --cflags`
 	ac_save_CPPFLAGS="$CPPFLAGS"
 	CPPFLAGS="$FREETYPEINCL $CPPFLAGS"
-	AC_CHECK_HEADERS(freetype/freetype.h \
+	AC_CHECK_HEADERS(ft2build.h \
+                         freetype/freetype.h \
                          freetype/ftglyph.h \
                          freetype/tttables.h \
                          freetype/ftnames.h \

dlls/gdi/freetype.c

@@ -45,6 +45,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(font);
 
 #ifdef HAVE_FREETYPE
 
+#ifdef HAVE_FT2BUILD_H
+#include <ft2build.h>
+#endif
 #ifdef HAVE_FREETYPE_FREETYPE_H
 #include <freetype/freetype.h>
 #endif

dlls/wineps/truetype.c

@@ -35,6 +35,9 @@
  *  is anybody's guess.
  */
 
+#ifdef HAVE_FT2BUILD_H
+#include <ft2build.h>
+#endif
 #ifdef HAVE_FREETYPE_FREETYPE_H
 #include <freetype/freetype.h>
 #endif

include/config.h.in

@@ -116,6 +116,9 @@
 /* Define to 1 if you have the <freetype/tttables.h> header file. */
 #undef HAVE_FREETYPE_TTTABLES_H
 
+/* Define to 1 if you have the <ft2build.h> header file. */
+#undef HAVE_FT2BUILD_H
+
 /* Define to 1 if you have the `ftruncate' function. */
 #undef HAVE_FTRUNCATE