Mercurial > octave

comparison configure.ac @ 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 a73dedb0d9b5 ff80c319e664
comparison
equal deleted inserted replaced
24899:1a46d174a483 24900:00d42b86d0a5
273 SHELL_PATH=$with_shell 273 SHELL_PATH=$with_shell
274 ;; 274 ;;
275 esac 275 esac
276 AC_DEFINE_UNQUOTED([SHELL_PATH], ["$SHELL_PATH"], 276 AC_DEFINE_UNQUOTED([SHELL_PATH], ["$SHELL_PATH"],
277 [Define this to be the path to the shell command interpreter.]) 277 [Define this to be the path to the shell command interpreter.])
278
279 ### Use the system-wide installation of GNU FreeFont if the user requests it.
280 ### By default, Octave includes its own copy of the FreeSans font, which it
281 ### installs in its own directory for use as a fallback default font. If this
282 ### configuration option is used, then do not install our own copy of the fonts
283 ### and assume they can be found in the provided system directory.
284 SYSTEM_FREEFONT_DIR=
285 AC_ARG_WITH([system-freefont],
286 [AS_HELP_STRING([--with-system-freefont=DIR],
287 [use FreeSans fonts in DIR (default: install and use internal copy)])])
288 case $with_system_freefont in
289 no | "")
290 SYSTEM_FREEFONT_DIR=
291 ;;
292 yes)
293 AC_MSG_ERROR([directory argument required for --with-system-freefont])
294 ;;
295 *)
296 SYSTEM_FREEFONT_DIR=$with_system_freefont
297 ;;
298 esac
299 if test -n "$SYSTEM_FREEFONT_DIR"; then
300 AC_MSG_NOTICE([configuring Octave to use system fonts in $SYSTEM_FREEFONT_DIR])
301 AC_DEFINE_UNQUOTED([SYSTEM_FREEFONT_DIR], ["$SYSTEM_FREEFONT_DIR"],
302 [Define this to be the system directory containing the GNU FreeFont fonts.])
303 fi
304 AM_CONDITIONAL([AMCOND_INSTALL_INTERNAL_FONT_FILES],
305 [test -z "$SYSTEM_FREEFONT_DIR"])
278 306
279 ### Determine which C++ compiler to use (we expect to find g++). 307 ### Determine which C++ compiler to use (we expect to find g++).
280 308
281 AC_PROG_CXX 309 AC_PROG_CXX
282 AC_PROG_CXXCPP 310 AC_PROG_CXXCPP