Where has Freetype config gone?

[Rein Klazes]

On Tue, 18 Nov 2003 18:48:39 +0200, you wrote:

> When trying to compile CVS Wine, I don't have freetype support. The 
> configure script claims that I don't have freetype-dev installed (I do).
> 
> configure.log shows the message:
> 
> In file included from conftest.c:95:
> /usr/include/freetype2/freetype/freetype.h:20:2: #error "`ft2build.h' 
> hasn't been included yet!"
> /usr/include/freetype2/freetype/freetype.h:21:2: #error "Please always 
> use macros to include FreeType header files."
> /usr/include/freetype2/freetype/freetype.h:22:2: #error "Example:"
> /usr/include/freetype2/freetype/freetype.h:23:2: #error "  #include 
> <ft2build.h>"
> /usr/include/freetype2/freetype/freetype.h:24:2: #error "  #include 
> FT_FREETYPE_H"
> 
> This message repeats several times (for several tests).
> 
> My system is a Debian Sid, and I have freetype2-dev installed properly.

Attached is a fix that fixes the problem on my system. Needs to run
autoconf, perhaps autoheader.

Changelog:
	.		: configure.ac
	dlls/gdi		: freetype.c
	dlls/wineps	: truetype.c

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

Rein.
-- 
Rein Klazes
rklazes at xs4all.nl
-------------- next part --------------
--- wine/configure.ac	2003-11-18 11:42:16.000000000 +0100
+++ mywine/configure.ac	2003-11-18 20:18:24.000000000 +0100
@@ -447,7 +447,8 @@
 	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 \
--- wine/dlls/gdi/freetype.c	2003-11-13 18:45:52.000000000 +0100
+++ mywine/dlls/gdi/freetype.c	2003-11-18 20:37:13.000000000 +0100
@@ -45,6 +45,9 @@
 
 #ifdef HAVE_FREETYPE
 
+#ifdef HAVE_FT2BUILD_H
+#include <ft2build.h>
+#endif
 #ifdef HAVE_FREETYPE_FREETYPE_H
 #include <freetype/freetype.h>
 #endif
--- wine/dlls/wineps/truetype.c	2003-09-06 01:08:28.000000000 +0200
+++ mywine/dlls/wineps/truetype.c	2003-11-18 20:38:33.000000000 +0100
@@ -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