Huw Davies : configure: Remove reference to obsolete ftnames.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 08453c1f2bbb4c74d6643fc8df7c040e2c765147
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=08453c1f2bbb4c74d6643fc8df...

Author: Huw Davies 
Date:   Wed Jun 24 15:41:04 2009 +0100

configure: Remove reference to obsolete ftnames.h.

---

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

diff --git a/configure b/configure
index 3f3548e..ebf519f 100755
--- a/configure
+++ b/configure
@@ -14601,13 +14601,11 @@ fi

-
 for ac_header in ft2build.h \
                          freetype/freetype.h \
                          freetype/ftglyph.h \
                          freetype/fttypes.h \
                          freetype/tttables.h \
-                         freetype/ftnames.h \
                          freetype/ftsnames.h \
                          freetype/ttnameid.h \
                          freetype/ftoutln.h \
diff --git a/configure.ac b/configure.ac
index bb4d82e..8ce3686 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1169,7 +1169,6 @@ then
                          freetype/ftglyph.h \
                          freetype/fttypes.h \
                          freetype/tttables.h \
-                         freetype/ftnames.h \
                          freetype/ftsnames.h \
                          freetype/ttnameid.h \
                          freetype/ftoutln.h \
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index ef93402..6500601 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -109,10 +109,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(font);
 #endif
 #ifdef HAVE_FREETYPE_FTSNAMES_H
 #include <freetype/ftsnames.h>
-#else
-# ifdef HAVE_FREETYPE_FTNAMES_H
-# include <freetype/ftnames.h>
-# endif
 #endif
 #ifdef HAVE_FREETYPE_TTNAMEID_H
 #include <freetype/ttnameid.h>
diff --git a/dlls/wineps.drv/truetype.c b/dlls/wineps.drv/truetype.c
index b526959..59ebe19 100644
--- a/dlls/wineps.drv/truetype.c
+++ b/dlls/wineps.drv/truetype.c
@@ -49,10 +49,6 @@
 #endif
 #ifdef HAVE_FREETYPE_FTSNAMES_H
 #include <freetype/ftsnames.h>
-#else
-# ifdef HAVE_FREETYPE_FTNAMES_H
-# include <freetype/ftnames.h>
-# endif
 #endif
 #ifdef HAVE_FREETYPE_TTNAMEID_H
 #include <freetype/ttnameid.h>
diff --git a/include/config.h.in b/include/config.h.in
index f6799c6..b2642c9 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -123,9 +123,6 @@
 /* Define to 1 if you have the <freetype/ftmodapi.h> header file. */
 #undef HAVE_FREETYPE_FTMODAPI_H

-/* Define to 1 if you have the <freetype/ftnames.h> header file. */
-#undef HAVE_FREETYPE_FTNAMES_H
-
 /* Define to 1 if you have the <freetype/ftoutln.h> header file. */
 #undef HAVE_FREETYPE_FTOUTLN_H