Bug 513709 - configure.in: Remove some useless vars, mozilla-* ones are enough; (Dv1) Remove HAVE_FT_*, _HAVE_FREETYPE2 and related

r=kairo
This commit is contained in:
Serge Gautherie 2009-09-01 14:19:32 +02:00
Родитель b932126311
Коммит 9f66544480
1 изменённых файлов: 0 добавлений и 39 удалений

Просмотреть файл

@ -3303,42 +3303,6 @@ else
fi
LDFLAGS="$_SAVE_LDFLAGS"
dnl ========================================================
dnl = Check for freetype2 and its functionality
dnl ========================================================
AC_CHECK_FT2(6.1.0, [_HAVE_FREETYPE2=1], [_HAVE_FREETYPE2=])
if test "$_HAVE_FREETYPE2"; then
_SAVE_LIBS="$LIBS"
_SAVE_CFLAGS="$CFLAGS"
LIBS="$LIBS $FT2_LIBS"
CFLAGS="$CFLAGS $FT2_CFLAGS"
AC_CACHE_CHECK(for FT_Bitmap_Size.y_ppem,
ac_cv_member_FT_Bitmap_Size_y_ppem,
[AC_TRY_COMPILE([#include <ft2build.h>
#include FT_FREETYPE_H],
[FT_Bitmap_Size s;
if (sizeof s.y_ppem) return 0;
return 1],
ac_cv_member_FT_Bitmap_Size_y_ppem=yes,
ac_cv_member_FT_Bitmap_Size_y_ppem=no)])
if test "$ac_cv_member_FT_Bitmap_Size_y_ppem" = yes; then
HAVE_FT_BITMAP_SIZE_Y_PPEM=1
else
HAVE_FT_BITMAP_SIZE_Y_PPEM=0
fi
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_FUNCS(FT_GlyphSlot_Embolden FT_Load_Sfnt_Table FT_Select_Size)
LIBS="$_SAVE_LIBS"
CFLAGS="$_SAVE_CFLAGS"
fi
fi # $no_x
AC_SUBST(XCFLAGS)
@ -5576,9 +5540,6 @@ if test -n "$MOZ_TREE_FREETYPE"; then
CAIRO_FT_CFLAGS="-I${MOZILLA_SRCDIR}/modules/freetype2/include"
FT2_LIBS="${LIBXUL_DIST}/lib/freetype2.lib"
CAIRO_FT_LIBS = "${LIBXUL_DIST}/lib/freetype2.lib"
AC_DEFINE(HAVE_FT_BITMAP_SIZE_Y_PPEM)
AC_DEFINE(HAVE_FT_GLYPHSLOT_EMBOLDEN)
AC_DEFINE(HAVE_FT_LOAD_SFNT_TABLE)
AC_SUBST(CAIRO_FT_CFLAGS)
fi