added handling of ft2build.h.

[swftools.git] / m4 / freetype.m4

diff --git a/m4/freetype.m4 b/m4/freetype.m4
index 84dc174..804311e 100644 (file)
--- a/m4/freetype.m4
+++ b/m4/freetype.m4
@@ -21,16 +21,19 @@ AC_CHECK_PROGS(FREETYPE_CONFIG, freetype-config,)
 OLDCPPFLAGS="${CPPFLAGS}"
 OLDLIBS="${LIBS}"
 if test "x${FREETYPE_CONFIG}" != "x"; then
-    CPPFLAGS="$CFLAGS "`freetype-config --cflags`
+    CPPFLAGS="$CPPFLAGS "`freetype-config --cflags`
 else if test -d /usr/include/freetype2; then
-    CPPFLAGS="$CFLAGS -I/usr/include/freetype2"
+    CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
 else if test -d /usr/local/include/freetype2; then
-    CPPFLAGS="$CFLAGS -I/usr/local/include/freetype2"
+    CPPFLAGS="$CPPFLAGS -I/usr/local/include/freetype2"
 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,9 +47,18 @@ 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>
+#endif
 #include <freetype/freetype.h>
 #include <freetype/ftglyph.h>
 #include <freetype/ftsnames.h>
@@ -89,7 +101,7 @@ int main()
 }
 EOF
 
-    ac_link='$CC $CPPFLAGS $CFLAGS conftest.c $LIBS -o conftest${ac_exeext}'
+    ac_link='$CC $CPPFLAGS $CFLAGS conftest.c $LDFLAGS $LIBS -o conftest${ac_exeext}'
     if { (eval echo freetype.m4:71: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
        AC_MSG_RESULT(yes)
        AC_DEFINE_UNQUOTED(HAVE_FREETYPE, 1)