Index: configure.in =================================================================== RCS file: /cvs/cairo/cairo/configure.in,v retrieving revision 1.130 diff -u -p -r1.130 configure.in --- configure.in 19 Aug 2005 00:22:23 -0000 1.130 +++ configure.in 21 Aug 2005 16:25:02 -0000 @@ -321,6 +321,8 @@ if test "x$use_freetype" = "xyes"; then fi fi +have_ft_load_sfnt_table=no + if test "x$use_freetype" = "xyes"; then AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_LIBS) @@ -339,6 +341,9 @@ if test "x$use_freetype" = "xyes"; then #include FT_FREETYPE_H]) AC_DEFINE_UNQUOTED(HAVE_FT_BITMAP_SIZE_Y_PPEM,$HAVE_FT_BITMAP_SIZE_Y_PPEM, [FT_Bitmap_Size structure includes y_ppem field]) + + AC_CHECK_FUNC(FT_Load_Sfnt_Table, have_ft_load_sfnt_table=yes) + LIBS="$temp_save_libs" CFLAGS="$temp_save_cflags" fi @@ -363,8 +368,8 @@ AC_ARG_ENABLE(ps, [ --disable-ps Disable cairo's PostScript backend], [use_ps=$enableval], [use_ps=yes]) -if test x"$use_freetype" != "xyes" ; then - AC_MSG_WARN([PS backend requires FreeType, disabling]) +if test x"$have_ft_load_sfnt_table" != "xyes" ; then + AC_MSG_WARN([PS backend requires FreeType 2.1.4 or newer, disabling]) use_ps=no fi @@ -391,8 +396,8 @@ AC_ARG_ENABLE(pdf, [ --disable-pdf Disable cairo's PDF backend], [use_pdf=$enableval], [use_pdf=yes]) -if test x"$use_freetype" != "xyes" ; then - AC_MSG_WARN([PDF backend requires FreeType, disabling]) +if test x"$have_ft_load_sfnt_table" != "xyes" ; then + AC_MSG_WARN([PDF backend requires FreeType 2.1.4 or newer, disabling]) use_pdf=no fi Index: ChangeLog =================================================================== RCS file: /cvs/cairo/cairo/ChangeLog,v retrieving revision 1.930 diff -u -p -r1.930 ChangeLog --- ChangeLog 21 Aug 2005 15:53:56 -0000 1.930 +++ ChangeLog 21 Aug 2005 16:25:03 -0000 @@ -1,5 +1,10 @@ 2005-08-21 Owen Taylor + * configure.in: Check for FT_Load_Sfnt_Table and disable + the PDF/PS backends if not found. (#4144, Billy Biggs) + +2005-08-21 Owen Taylor + * src/cairo-surface.c (_cairo_surface_clone_similar): Fix the handling of backend->clone_similar == NULL. (#4161, Christian Biesinger)