git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e75fb62
)
added handling of ft2build.h.
author
kramm
<kramm>
Thu, 2 Sep 2004 19:59:39 +0000
(19:59 +0000)
committer
kramm
<kramm>
Thu, 2 Sep 2004 19:59:39 +0000
(19:59 +0000)
lib/modules/swffont.c
patch
|
blob
|
history
m4/freetype.m4
patch
|
blob
|
history
diff --git
a/lib/modules/swffont.c
b/lib/modules/swffont.c
index
73fa7a3
..
65ca5cc
100644
(file)
--- a/
lib/modules/swffont.c
+++ b/
lib/modules/swffont.c
@@
-34,6
+34,9
@@
void swf_SetLoadFontParameters(int _scale, int _skip_unused, int _full_unicode)
#ifdef HAVE_FREETYPE
#ifdef HAVE_FREETYPE
+#ifdef HAVE_FREETYPE_FT2BUILD_H
+#include <freetype/ft2build.h>
+#endif
#include <freetype/freetype.h>
#include <freetype/ftglyph.h>
#include <freetype/ftsizes.h>
#include <freetype/freetype.h>
#include <freetype/ftglyph.h>
#include <freetype/ftsizes.h>
diff --git
a/m4/freetype.m4
b/m4/freetype.m4
index
5e95677
..
804311e
100644
(file)
--- a/
m4/freetype.m4
+++ b/
m4/freetype.m4
@@
-29,8
+29,11
@@
else if test -d /usr/local/include/freetype2; then
fi
fi
fi
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_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
if test "x${HAVE_LIB_FREETYPE}" != "x";then
if test "x${HAVE_FREETYPE_FREETYPE_H}" != "x";then
HAVE_FREETYPE=1
@@
-44,9
+47,18
@@
if test "x${HAVE_FREETYPE}" = "x1"; then
LIBS="$LIBS -lfreetype"
fi
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
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>
+#endif
#include <freetype/freetype.h>
#include <freetype/ftglyph.h>
#include <freetype/ftsnames.h>
#include <freetype/freetype.h>
#include <freetype/ftglyph.h>
#include <freetype/ftsnames.h>