Remove freetype2 code, which was used only by the old gfx code. b=389697 r+a1.9=vlad

config/autoconf.mk.in

@@ -479,7 +479,6 @@ MOZ_DBUS_GLIB_CFLAGS    = @MOZ_DBUS_GLIB_CFLAGS@
 MOZ_DBUS_GLIB_LIBS      = @MOZ_DBUS_GLIB_LIBS@
 MOZ_ENABLE_DBUS         = @MOZ_ENABLE_DBUS@
 
-MOZ_ENABLE_FREETYPE2   = @MOZ_ENABLE_FREETYPE2@
 FT2_CFLAGS             = @FT2_CFLAGS@
 FT2_LIBS               = @FT2_LIBS@
 

configure.in

@@ -4762,26 +4762,6 @@ fi
 AC_DEFINE_UNQUOTED(MOZ_DISTRIBUTION_ID,"$MOZ_DISTRIBUTION_ID")
 AC_SUBST(MOZ_DISTRIBUTION_ID)
 
-dnl ========================================================
-dnl = FreeType2
-dnl = Enable freetype by default if building against X11 
-dnl = and freetype is available
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(freetype2,
-[  --disable-freetype2     Disable FreeType2 support ],
-    MOZ_ENABLE_FREETYPE2=,
-    MOZ_ENABLE_FREETYPE2=1)
-
-if test "$MOZ_ENABLE_FREETYPE2" && test -z "$MOZ_X11" -o -z "$_HAVE_FREETYPE2"; then
-    AC_MSG_ERROR([Cannot enable FreeType2 support for non-X11 toolkits or if FreeType2 is not detected.])
-fi
-
-if test "$MOZ_ENABLE_FREETYPE2"; then
-    AC_DEFINE(MOZ_ENABLE_FREETYPE2)
-    _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES MOZ_ENABLE_FREETYPE2"
-fi
-AC_SUBST(MOZ_ENABLE_FREETYPE2)
-
 dnl ========================================================
 dnl = Xft
 dnl ========================================================
@@ -4798,10 +4778,6 @@ if test "$MOZ_ENABLE_XFT" && test -z "$MOZ_ENABLE_GTK2"; then
     AC_MSG_ERROR([Cannot enable XFT support for non-GTK2 toolkits.])
 fi
 
-if test "$MOZ_ENABLE_XFT" && test "$MOZ_ENABLE_FREETYPE2"; then
-    AC_MSG_ERROR([Cannot enable XFT and FREETYPE2 at the same time.])
-fi
-
 if test "$MOZ_ENABLE_XFT"
 then
     AC_DEFINE(MOZ_ENABLE_XFT)

gfx/idl/Makefile.in

@@ -55,12 +55,5 @@ XPIDLSRCS	= \
 		gfxtypes.idl \
 		$(NULL)
 
-ifdef MOZ_ENABLE_FREETYPE2
-XPIDLSRCS	+= \
-		nsIFontCatalogService.idl \
-		nsIFreeType2.idl \
-		$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
 

gfx/src/Makefile.in

@@ -64,10 +64,6 @@ REQUIRES	= xpcom \
 
 DIRS        = shared
 
-ifdef MOZ_ENABLE_FREETYPE2
-DIRS        += freetype
-endif
-
 ifdef MOZ_ENABLE_POSTSCRIPT
 DIRS        += psshared
 endif