Bug 513709 - configure.in: Remove some useless vars, mozilla-* ones are enough; (Dv1) Remove HAVE_FT_*, _HAVE_FREETYPE2 and related
authorSerge Gautherie <sgautherie.bz@free.fr>
Tue, 01 Sep 2009 14:19:32 +0200
changeset 3469 74e8dd33f86e763d6dfa5a63c6dffb4821878c16
parent 3468 44f9a9bf631568385abd1e2ff0845a93fcafd45f
child 3470 9397894f6421c3a3b2670870a0e0a8fc106f2165
push idunknown
push userunknown
push dateunknown
bugs513709
Bug 513709 - configure.in: Remove some useless vars, mozilla-* ones are enough; (Dv1) Remove HAVE_FT_*, _HAVE_FREETYPE2 and related r=kairo
configure.in
--- a/configure.in
+++ b/configure.in
@@ -3298,52 +3298,16 @@ else
 		;;
 	    *)
 		HAVE_XIE=1
 		;;
 	esac
     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)
 AC_SUBST(XLDFLAGS)
 AC_SUBST(XLIBS)
 AC_SUBST(XT_LIBS)
 
 AC_MSG_CHECKING(for ARM SIMD support)
@@ -5571,19 +5535,16 @@ MOZ_ARG_ENABLE_BOOL(tree-freetype,
 if test -n "$MOZ_TREE_FREETYPE"; then
    AC_DEFINE(MOZ_TREE_FREETYPE)
    AC_SUBST(MOZ_TREE_FREETYPE)
    MOZ_ENABLE_CAIRO_FT=1
    FT2_CFLAGS="-I${MOZILLA_SRCDIR}/modules/freetype2/include"
    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
 
 dnl ========================================================
 dnl experimental ldap features
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(ldap-experimental,
 [  --enable-ldap-experimental