git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade to xpdf 3.00.
[swftools.git]
/
m4
/
freetype.m4
diff --git
a/m4/freetype.m4
b/m4/freetype.m4
index
84dc174
..
3ffbea0
100644
(file)
--- a/
m4/freetype.m4
+++ b/
m4/freetype.m4
@@
-20,38
+20,61
@@
AC_DEFUN(RFX_CHECK_FREETYPE,
AC_CHECK_PROGS(FREETYPE_CONFIG, freetype-config,)
OLDCPPFLAGS="${CPPFLAGS}"
OLDLIBS="${LIBS}"
AC_CHECK_PROGS(FREETYPE_CONFIG, freetype-config,)
OLDCPPFLAGS="${CPPFLAGS}"
OLDLIBS="${LIBS}"
-if test "x${FREETYPE_CONFIG}" != "x"; then
- CPPFLAGS="$CFLAGS "`freetype-config --cflags`
+if test "x${FREETYPE_CONFIG}" '!=' "x"; then
+ CPPFLAGS="$CPPFLAGS "`freetype-config --cflags`
else if test -d /usr/include/freetype2; then
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
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
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)
-if test "x${HAVE_LIB_FREETYPE}" != "x";then
-if test "x${HAVE_FREETYPE_FREETYPE_H}" != "x";then
- HAVE_FREETYPE=1
-fi
+AC_CHECK_HEADERS(ft2build.h,HAVE_FT2BUILD_H=1)
+
+if test "x${HAVE_LIB_FREETYPE}" '!=' "x";then
+ if test "x${HAVE_FREETYPE_FREETYPE_H}" '!=' "x";then
+ HAVE_FREETYPE=1
+ fi
+ if test "x${HAVE_FT2BUILD_H}" '!=' "x";then
+ HAVE_FREETYPE=1
+ fi
fi
if test "x${HAVE_FREETYPE}" = "x1"; then
fi
if test "x${HAVE_FREETYPE}" = "x1"; then
- if test "x{$FREETYPE_CONFIG}" != "x"; then
+ if test "x{$FREETYPE_CONFIG}" '!=' "x"; then
LIBS="$LIBS "`freetype-config --libs`
else
LIBS="$LIBS -lfreetype"
fi
LIBS="$LIBS "`freetype-config --libs`
else
LIBS="$LIBS -lfreetype"
fi
+if test "x${HAVE_FT2BUILD_H}" = "x1"; then
+ HAVE_FT2BUILD_H_DEFINE='#define HAVE_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_FT2BUILD_H_DEFINE
+
+#ifdef HAVE_FT2BUILD_H
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_SIZES_H
+#include FT_SFNT_NAMES_H
+#include FT_TRUETYPE_IDS_H
+#include FT_OUTLINE_H
+#else
#include <freetype/freetype.h>
#include <freetype/ftglyph.h>
#include <freetype/freetype.h>
#include <freetype/ftglyph.h>
+#include <freetype/ftsizes.h>
#include <freetype/ftsnames.h>
#include <freetype/ttnameid.h>
#include <freetype/ftoutln.h>
#include <freetype/ftsnames.h>
#include <freetype/ttnameid.h>
#include <freetype/ftoutln.h>
+#endif
int main()
{
int main()
{
@@
-89,7
+112,7
@@
int main()
}
EOF
}
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)
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)
@@
-104,7
+127,7
@@
EOF
fi
# if the above didn't work out, reset all changes to the compiler variables.
fi
# if the above didn't work out, reset all changes to the compiler variables.
-if test "x${HAVE_FREETYPE}" "!=" "x1"; then
+if test "x${HAVE_FREETYPE}" '!=' "x1"; then
CPPFLAGS=$OLDCPPFLAGS
LIBS=$OLDLIBS
fi
CPPFLAGS=$OLDCPPFLAGS
LIBS=$OLDLIBS
fi