Bug 1747324 - Remove check for fontconfig/fcfreetype.h. r=firefox-bui…

…ld-system-reviewers,andi

All supported versions of fontconfig have it.

Differential Revision: https://phabricator.services.mozilla.com/D134564

gfx/thebes/gfxFT2Utils.cpp

@@ -7,7 +7,7 @@
 #include "gfxFT2Utils.h"
 #include "mozilla/Likely.h"
 
-#ifdef HAVE_FONTCONFIG_FCFREETYPE_H
+#ifdef USE_FC_FREETYPE
 #  include <fontconfig/fcfreetype.h>
 #endif
 
@@ -19,7 +19,7 @@
 uint32_t gfxFT2LockedFace::GetGlyph(uint32_t aCharCode) {
   if (MOZ_UNLIKELY(!mFace)) return 0;
 
-#ifdef HAVE_FONTCONFIG_FCFREETYPE_H
+#ifdef USE_FC_FREETYPE
   // FcFreeTypeCharIndex will search starting from the most recently
   // selected charmap.  This can cause non-determistic behavior when more
   // than one charmap supports a character but with different glyphs, as
@@ -55,7 +55,7 @@ uint32_t gfxFT2LockedFace::GetUVSGlyph(uint32_t aCharCode,
   static CharVariantFunction sGetCharVariantPtr = FindCharVariantFunction();
   if (!sGetCharVariantPtr) return 0;
 
-#ifdef HAVE_FONTCONFIG_FCFREETYPE_H
+#ifdef USE_FC_FREETYPE
   // FcFreeTypeCharIndex may have changed the selected charmap.
   // FT_Face_GetCharVariantIndex needs a unicode charmap.
   if (!mFace->charmap || mFace->charmap->encoding != FT_ENCODING_UNICODE) {

old-configure.in

@@ -1493,12 +1493,6 @@ if test "$USE_FC_FREETYPE"; then
             LIBS="$_SAVE_LIBS"
             CFLAGS="$_SAVE_CFLAGS"
         fi
-
-        _SAVE_CPPFLAGS="$CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
-        MOZ_CHECK_HEADERS([fontconfig/fcfreetype.h], ,
-            [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)], [#include <fontconfig/fontconfig.h>])
-        CPPFLAGS="$_SAVE_CPPFLAGS"
     fi
 fi