summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2003-02-12 22:12:55 +0000
committerOwen Taylor <otaylor@src.gnome.org>2003-02-12 22:12:55 +0000
commit9c0b83ce9873de6cff41134c79fb9c2489a299c3 (patch)
tree19b1b500c884972b96b4c16aff927102fef059a9 /configure.in
parent32134ad968742529b13f39003b909dc906e4fa72 (diff)
downloadpango-9c0b83ce9873de6cff41134c79fb9c2489a299c3.tar.gz
Up the FreeType version requirement to 2.0.9. (2.2.1 had a compilation
Wed Feb 12 16:59:23 2003 Owen Taylor <otaylor@redhat.com> * configure.in pango/opentype/fterrcompat.h README: Up the FreeType version requirement to 2.0.9. (2.2.1 had a compilation failure with older versions, this catches it more cleanly, and removes some unneeded checks. #105302, problem reported by Will Partain.)
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in33
1 files changed, 1 insertions, 32 deletions
diff --git a/configure.in b/configure.in
index 75b6a686..4145f6ee 100644
--- a/configure.in
+++ b/configure.in
@@ -157,43 +157,12 @@ if test "x$FREETYPE_CONFIG" != "xno" ; then
pango_save_ldflags=$LDFLAGS
LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
- AC_CHECK_LIB(freetype, FT_New_Face, have_freetype=true, :)
+ AC_CHECK_LIB(freetype, FT_Get_Next_Char, have_freetype=true, :)
LDFLAGS=$pango_save_ldflags
-
- if $have_freetype ; then
- pango_save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
-
- AC_MSG_CHECKING([For sufficiently new FreeType (at least 2.0.1)])
- AC_TRY_COMPILE([
-#include <freetype/freetype.h>
-#include FT_ERRORS_H
-]
- ,[(void)1;],:,have_freetype=false)
- if $have_freetype ; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
-
- CPPFLAGS="$pango_save_cppflags"
- fi
fi
AC_SUBST(FREETYPE_LIBS)
AC_SUBST(FREETYPE_CFLAGS)
-## see which freetype we have, 2.0.3 vs. 2.0.4
-pango_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
-AC_CHECK_HEADER(freetype/internal/tterrors.h, AC_DEFINE(HAVE_FREETYPE_2_0_3))
-CPPFLAGS="$pango_save_cppflags"
-
-## Check to see whether we have FT_Get_First_Char(), new in 2.0.9
-pango_save_libs=$LIBS
-LIBS="$LIBS $FREETYPE_LIBS"
-AC_CHECK_FUNCS(FT_Get_First_Char)
-LIBS=$pango_save_libs
-
#
# Check for fontconfig
#