Use autoconf checks to check for various FreeType headers.

configure.in

@@ -404,6 +404,15 @@ else
     	AC_DEFINE(HAVE_FREETYPE)
 	FREETYPELIBS=`$ft_devel --libs`
 	FREETYPEINCL=`$ft_devel --cflags`
+	ac_save_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="$FREETYPEINCL $CPPFLAGS"
+	AC_CHECK_HEADERS(freetype/freetype.h \
+                         freetype/ftglyph.h \
+                         freetype/tttables.h \
+                         freetype/ftnames.h \
+                         freetype/ftsnames.h \
+                         freetype/ttnameid.h)
+	CPPFLAGS="$ac_save_CPPFLAGS"
 	wine_cv_msg_freetype=no
     fi
 fi

dlls/wineps/truetype.c

@@ -9,11 +9,30 @@
 
 #ifdef HAVE_FREETYPE
 
+/*
+ *  These stupid #ifdefs should work for FreeType 2.0.1 and 2.0.2.  Beyond that
+ *  is anybody's guess.
+ */
+
+#ifdef HAVE_FREETYPE_FREETYPE_H
 #include <freetype/freetype.h>
-#include FT_NAMES_H
-#include FT_TRUETYPE_NAMES_H
-#include FT_TRUETYPE_TABLES_H
-#include FT_GLYPH_H
+#endif
+#ifdef HAVE_FREETYPE_FTGLYPH_H
+#include <freetype/ftglyph.h>
+#endif
+#ifdef HAVE_FREETYPE_TTTABLES_H
+#include <freetype/tttables.h>
+#endif
+#ifdef HAVE_FREETYPE_FTNAMES_H
+#include <freetype/ftnames.h>
+#endif
+#ifdef HAVE_FREETYPE_FTSNAMES_H
+#include <freetype/ftsnames.h>
+#endif
+#ifdef HAVE_FREETYPE_TTNAMEID_H
+#include <freetype/ttnameid.h>
+#endif
+
 #include <sys/types.h>
 #include <dirent.h>
 #include <string.h>

include/config.h.in

@@ -341,6 +341,24 @@
 /* Define if you have the <float.h> header file.  */
 #undef HAVE_FLOAT_H
 
+/* Define if you have the <freetype/freetype.h> header file.  */
+#undef HAVE_FREETYPE_FREETYPE_H
+
+/* Define if you have the <freetype/ftglyph.h> header file.  */
+#undef HAVE_FREETYPE_FTGLYPH_H
+
+/* Define if you have the <freetype/ftnames.h> header file.  */
+#undef HAVE_FREETYPE_FTNAMES_H
+
+/* Define if you have the <freetype/ftsnames.h> header file.  */
+#undef HAVE_FREETYPE_FTSNAMES_H
+
+/* Define if you have the <freetype/ttnameid.h> header file.  */
+#undef HAVE_FREETYPE_TTNAMEID_H
+
+/* Define if you have the <freetype/tttables.h> header file.  */
+#undef HAVE_FREETYPE_TTTABLES_H
+
 /* Define if you have the <ieeefp.h> header file.  */
 #undef HAVE_IEEEFP_H