From: kramm Date: Sat, 5 Jul 2003 16:59:37 +0000 (+0000) Subject: added checking for freetype. X-Git-Tag: release-0-5-0~212 X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=8ddaab4d47fd49157648993fce716da20cd83e98 added checking for freetype. --- diff --git a/config.h.in b/config.h.in index 51cdf13..f58e55a 100644 --- a/config.h.in +++ b/config.h.in @@ -106,6 +106,9 @@ /* use gzip/uncompress */ #undef USE_GZIP +/* use libfreetype */ +#undef USE_FREETYPE + /* system() can handle command substitution */ #undef SYSTEM_BACKTICKS diff --git a/configure.in b/configure.in index a60f54e..ffa2b3b 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging], DEBUG=true) PACKAGE=swftools -VERSION=0.5.0-pre4 +VERSION=0.5.0-pre8 # -Winline? if test "x$CHECKMEM" '!=' "x";then @@ -57,6 +57,11 @@ fi AC_PROG_LN_S AC_PROG_LIBTOOL AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, ) + AC_CHECK_PROGS(FREETYPE_CONFIG, freetype-config, ) + +if test "x$FREETYPE_CONFIG" != "x";then + USE_FREETYPE=yes +fi dnl Checks for system services AC_EXEEXT @@ -107,6 +112,9 @@ dnl Checks for libraries. DISABLEPDF2SWF=true; MISSINGLIBS="${MISSINGLIBS} t1lib" ) + AC_CHECK_LIB(freetype, FT_Init_FreeType, + USE_FREETYPE=true, + ) RFX_CHECK_BYTEORDER AC_SUBST(WORDS_BIGENDIAN) @@ -136,6 +144,7 @@ if test "x${ac_cv_header_zlib_h}" != "xyes"; then ZLIBMISSING=true; fi +AC_DEFINE_UNQUOTED(USE_FREETYPE, "$USE_FREETYPE") AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -170,6 +179,26 @@ if test "x${AVIFILE}" != "xtrue"; then avi2swf= fi +if test "x${USE_FREETYPE}" == "xtrue"; then + if test "x{$FREETYPE_CONFIG}" != "x"; then + ftinclude=`freetype-config --cflags` + ftlibs=`freetype-config --libs` + CXXFLAGS="$CXXFLAGS $ftinclude" + CFLAGS="$CFLAGS $ftinclude" + LIBS="$LIBS $ftlibs" + else if test -d /usr/include/freetype2; then + CXXFLAGS="$CXXFLAGS -I/usr/include/freetype2" + CFLAGS="$CFLAGS -I/usr/include/freetype2" + LIBS="$LIBS -lfreetype" + else if test -d /usr/local/include/freetype2; then + CXXFLAGS="$CXXFLAGS -I/usr/local/include/freetype2" + CFLAGS="$CFLAGS -I/usr/local/include/freetype2" + LIBS="$LIBS -L /usr/local/lib -lfreetype" + fi + fi + fi +fi + if test "x${UNCOMPRESS}" = "xgzip"; then AC_DEFINE_UNQUOTED(USE_GZIP, 1) fi