Updated FreeType header autoconf patch

[Ian Pilcher]

Modified files:
    configure.in
    include: acconfig.h
    dlls/wineps: truetype.c

Log message:
    Ian Pilcher
    Use autoconf checks to check for various FreeType headers
-- 
========================================================================
Ian Pilcher                                         ian.pilcher at home.com
========================================================================
-------------- next part --------------
--- ../wine-20010604cvs/configure.in	Fri Jun  1 11:44:56 2001
+++ configure.in	Mon Jun  4 18:29:41 2001
@@ -404,6 +404,14 @@
     	AC_DEFINE(HAVE_FREETYPE)
 	FREETYPELIBS=`$ft_devel --libs`
 	FREETYPEINCL=`$ft_devel --cflags`
+	old_cppflags="$CPPFLAGS"
+	CPPFLAGS="$FREETYPEINCL $CPPFLAGS"
+	export CPPFLAGS
+	AC_CHECK_HEADERS(freetype/freetype.h freetype/ftglyph.h)
+	AC_CHECK_HEADERS(freetype/tttables.h freetype/ftnames.h)
+	AC_CHECK_HEADERS(freetype/ftsnames.h freetype/ttnameid.h)
+	CPPFLAGS="$old_cppflags"
+	export CPPFLAGS
 	wine_cv_msg_freetype=no
     fi
 fi
--- ../wine-20010604cvs/include/acconfig.h	Tue May 29 18:16:35 2001
+++ include/acconfig.h	Mon Jun  4 18:31:01 2001
@@ -129,3 +129,11 @@
 
 /* Define if FreeType 2 is installed */
 #undef HAVE_FREETYPE
+
+/* Define if various FreeType headers are present */
+#undef HAVE_FREETYPE_FREETYPE_H
+#undef HAVE_FREETYPE_FTGLYPH_H
+#undef HAVE_FREETYPE_TTTABLES_H
+#undef HAVE_FREETYPE_FTNAMES_H
+#undef HAVE_FREETYPE_FTSNAMES_H
+#undef HAVE_FREETYPE_TTNAMEID_H
--- ../wine-20010604cvs/dlls/wineps/truetype.c	Tue May 29 18:16:33 2001
+++ dlls/wineps/truetype.c	Mon Jun  4 18:37:29 2001
@@ -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>