From e617a9c5283dbea914addb68cb7b33a64d7600fb Mon Sep 17 00:00:00 2001
From: Rein Klazes <rklazes@xs4all.nl>
Date: Wed, 19 Nov 2003 02:18:13 +0000
Subject: [PATCH] Include ft2build.h before freetype/freetype.h. Libfreetype
 2.1.7 requires this.

---
 configure              | 4 +++-
 configure.ac           | 3 ++-
 dlls/gdi/freetype.c    | 3 +++
 dlls/wineps/truetype.c | 3 +++
 include/config.h.in    | 3 +++
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 94ba72f4683..9c263ed0f24 100755
--- a/configure
+++ b/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 \
diff --git a/configure.ac b/configure.ac
index 26032be0892..bf00ea6bce3 100644
--- a/configure.ac
+++ b/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 \
diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c
index ad7de4b7c29..81fdeb4fc28 100644
--- a/dlls/gdi/freetype.c
+++ b/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
diff --git a/dlls/wineps/truetype.c b/dlls/wineps/truetype.c
index 31797b28a57..4078acd3f01 100644
--- a/dlls/wineps/truetype.c
+++ b/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
diff --git a/include/config.h.in b/include/config.h.in
index 343466c50f9..feaf9e154dc 100644
--- a/include/config.h.in
+++ b/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