Huw Davies : gdi32: Remove no longer needed include file.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6ee2eaeff2aff2acff06d00eb0a2fbe6e412d93a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6ee2eaeff2aff2acff06d00eb0...

Author: Huw Davies 
Date:   Tue Oct 11 10:14:55 2011 +0100

gdi32: Remove no longer needed include file.

---

configure             |   18 +-----------------
 configure.ac          |    8 +-------
 dlls/gdi32/freetype.c |    3 ---
 include/config.h.in   |    6 ------
 4 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/configure b/configure
index 0e968c2..3cf9675 100755
--- a/configure
+++ b/configure
@@ -10262,8 +10262,7 @@ fi
                          freetype/ftoutln.h \
                          freetype/ftwinfnt.h \
                          freetype/ftmodapi.h \
-                         freetype/ftlcdfil.h \
-                         freetype/internal/sfnt.h
+                         freetype/ftlcdfil.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_FT2BUILD_H
@@ -10304,21 +10303,6 @@ _ACEOF

fi

-        ac_save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $ac_freetype_libs"
-        for ac_func in FT_Load_Sfnt_Table
-do :
-  ac_fn_c_check_func "$LINENO" "FT_Load_Sfnt_Table" "ac_cv_func_FT_Load_Sfnt_Table"
-if test "x$ac_cv_func_FT_Load_Sfnt_Table" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FT_LOAD_SFNT_TABLE 1
-_ACEOF
-
-fi
-done
-
-        CFLAGS="$ac_save_CFLAGS"
-	CPPFLAGS="$ac_save_CPPFLAGS"
    	if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes"
    then

diff --git a/configure.ac b/configure.ac
index 1401072..5de420b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1373,8 +1373,7 @@ then
                          freetype/ftoutln.h \
                          freetype/ftwinfnt.h \
                          freetype/ftmodapi.h \
-                         freetype/ftlcdfil.h \
-                         freetype/internal/sfnt.h,,,
+                         freetype/ftlcdfil.h,,,
                          [#ifdef HAVE_FT2BUILD_H
                           # include <ft2build.h>
                           #endif])
@@ -1383,11 +1382,6 @@ then
           [Define if you have the <freetype/fttrigon.h> header file.])
                     wine_cv_fttrigon=yes],[wine_cv_fttrigon=no])
         AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <freetype/ftmodapi.h>])
-        ac_save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $ac_freetype_libs"
-        AC_CHECK_FUNCS(FT_Load_Sfnt_Table)
-        CFLAGS="$ac_save_CFLAGS"
-	CPPFLAGS="$ac_save_CPPFLAGS"
    dnl Check that we have at least freetype/freetype.h
    if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes"
    then
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 9357766..e527490 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -117,9 +117,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(font);
 #ifdef HAVE_FREETYPE_FTOUTLN_H
 #include <freetype/ftoutln.h>
 #endif
-#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H
-#include <freetype/internal/sfnt.h>
-#endif
 #ifdef HAVE_FREETYPE_FTTRIGON_H
 #include <freetype/fttrigon.h>
 #endif
diff --git a/include/config.h.in b/include/config.h.in
index f0016c8..f70e354 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -152,9 +152,6 @@
 /* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */
 #undef HAVE_FREETYPE_FTWINFNT_H

-/* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */
-#undef HAVE_FREETYPE_INTERNAL_SFNT_H
-
 /* Define to 1 if you have the <freetype/ttnameid.h> header file. */
 #undef HAVE_FREETYPE_TTNAMEID_H

@@ -179,9 +176,6 @@
 /* Define to 1 if you have the `ftruncate' function. */
 #undef HAVE_FTRUNCATE

-/* Define to 1 if you have the `FT_Load_Sfnt_Table' function. */
-#undef HAVE_FT_LOAD_SFNT_TABLE
-
 /* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */
 #undef HAVE_FT_TRUETYPEENGINETYPE