Mercurial > octave

diff libinterp/corefcn/ft-text-renderer.cc @ 24900:00d42b86d0a5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure: new option --with-system-freefont to use system fonts (bug #53348) * configure.ac (--with-system-freefont): New command-line option. (SYSTEM_FREEFONT_DIR): New preprocessor macro. (AMCOND_INSTALL_INTERNAL_FONT_FILES): New automake conditional. * etc/module.mk (octfonts_DATA): Include $(fallback_FONT_FILES) in the list only when AMCOND_INSTALL_INTERNAL_FONT_FILES is true. * ft-text-renderer.cc (ft_manager::do_get_font): Use SYSTEM_FREEFONT_DIR if it is defined.
author Mike Miller <mtmiller@octave.org>
date Fri, 16 Mar 2018 16:59:40 -0700
parents 1a46d174a483
children 6652d3823428
line wrap: on
line diff
--- a/libinterp/corefcn/ft-text-renderer.cc	Fri Mar 16 15:28:34 2018 -0700
+++ b/libinterp/corefcn/ft-text-renderer.cc	Fri Mar 16 16:59:40 2018 -0700
@@ -213,7 +213,11 @@
           fonts_dir = sys::env::getenv ("OCTAVE_FONTS_DIR");
 
           if (fonts_dir.empty ())
+#if defined (SYSTEM_FREEFONT_DIR)
+            fonts_dir = SYSTEM_FREEFONT_DIR;
+#else
             fonts_dir = config::oct_fonts_dir ();
+#endif
         }