# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1592317247 14400
# Node ID 6dd150e3c785659ed5f6aabee4e30c0ed90250fb
# Parent  98fbb75cd028448e9a0fd1c8af87922893b80240# Parent  98889de398dddca9164b2bc5cbc97076b2a449d0
maint: merge stable to default.

diff -r 98fbb75cd028 -r 6dd150e3c785 libinterp/corefcn/ft-text-renderer.cc
--- a/libinterp/corefcn/ft-text-renderer.cc	Mon Jun 15 16:46:51 2020 -0400
+++ b/libinterp/corefcn/ft-text-renderer.cc	Tue Jun 16 10:20:47 2020 -0400
@@ -198,6 +198,7 @@
 
       if (font_map.isempty ())
         {
+#if defined (HAVE_FONTCONFIG)
           FcConfig *config = FcConfigGetCurrent();
           FcPattern *pat = FcPatternCreate ();
           FcObjectSet *os = FcObjectSetBuild (FC_FAMILY, FC_SLANT, FC_WEIGHT,
@@ -269,6 +270,7 @@
               if (fs)
                 FcFontSetDestroy (fs);
             }
+#endif
         }
 
       return font_map;