X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=m4%2Ffreetype.m4;h=c40460b26f62fcbb4894b1d05df3af882b8b95dc;hb=cabd1ffdcf5cffd42fba19c15bdbd93adb55a0c7;hp=5e956771d431e43bdd636f7434746ea5e317d098;hpb=356de1faa3f444b04d1f470127587becba9ca3c0;p=swftools.git

diff --git a/m4/freetype.m4 b/m4/freetype.m4
index 5e95677..c40460b 100644
--- a/m4/freetype.m4
+++ b/m4/freetype.m4
@@ -29,8 +29,11 @@ else if test -d /usr/local/include/freetype2; then
 fi 
 fi
 fi
+
 AC_CHECK_LIB(freetype, FT_Init_FreeType,HAVE_LIB_FREETYPE=1,)
 AC_CHECK_HEADERS(freetype/freetype.h,HAVE_FREETYPE_FREETYPE_H=1)
+AC_CHECK_HEADERS(freetype/ft2build.h,HAVE_FREETYPE_FT2BUILD_H=1)
+
 if test "x${HAVE_LIB_FREETYPE}" != "x";then
 if test "x${HAVE_FREETYPE_FREETYPE_H}" != "x";then
     HAVE_FREETYPE=1
@@ -44,14 +47,26 @@ if test "x${HAVE_FREETYPE}" = "x1"; then
 	LIBS="$LIBS -lfreetype"
     fi
 
+if test "x${HAVE_FREETYPE_FT2BUILD_H}" = "x1"; then
+    HAVE_FREETYPE_FT2BUILD_H_DEFINE='#define HAVE_FREETYPE_FT2BUILD_H'
+fi
+
     AC_MSG_CHECKING([whether we can compile the freetype test program])
 
     cat > conftest.c << EOF
+$HAVE_FREETYPE_FT2BUILD_H_DEFINE
+
+#ifdef HAVE_FREETYPE_FT2BUILD_H
+#include <freetype/ft2build.h>
+#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()
 {