From: kramm <kramm>
Date: Thu, 2 Sep 2004 20:06:54 +0000 (+0000)
Subject: use FT_FREETYPE_H if we have ft2build.h.
X-Git-Tag: xpdf-3-00~64
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=cabd1ffdcf5cffd42fba19c15bdbd93adb55a0c7

use FT_FREETYPE_H if we have ft2build.h.
---

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index 65ca5cc..a812275 100644
--- a/lib/modules/swffont.c
+++ b/lib/modules/swffont.c
@@ -36,13 +36,15 @@ void swf_SetLoadFontParameters(int _scale, int _skip_unused, int _full_unicode)
 
 #ifdef HAVE_FREETYPE_FT2BUILD_H
 #include <freetype/ft2build.h>
-#endif
+#include FT_FREETYPE_H
+#else
 #include <freetype/freetype.h>
 #include <freetype/ftglyph.h>
 #include <freetype/ftsizes.h>
 #include <freetype/ftsnames.h>
 #include <freetype/ttnameid.h>
 #include <freetype/ftoutln.h>
+#endif
 
 #define FT_SCALE 1
 #define FT_SUBPIXELS 64
diff --git a/m4/freetype.m4 b/m4/freetype.m4
index 804311e..c40460b 100644
--- a/m4/freetype.m4
+++ b/m4/freetype.m4
@@ -58,12 +58,15 @@ $HAVE_FREETYPE_FT2BUILD_H_DEFINE
 
 #ifdef HAVE_FREETYPE_FT2BUILD_H
 #include <freetype/ft2build.h>
-#endif
+#include FT_FREETYPE_H
+#else
 #include <freetype/freetype.h>
 #include <freetype/ftglyph.h>
+#include <freetype/ftsizes.h>
 #include <freetype/ftsnames.h>
 #include <freetype/ttnameid.h>
 #include <freetype/ftoutln.h>
+#endif
 
 int main()
 {