[PATCH xserver 06/12] meson: Add option to set default font path

[Adam Jackson]

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 include/meson.build | 2 +-
 meson_options.txt   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/meson.build b/include/meson.build
index 69aea80955..654977cb45 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -87,8 +87,8 @@ conf_data.set_quoted('SERVER_MISC_CONFIG_PATH', serverconfigdir)
 conf_data.set_quoted('PROJECTROOT', get_option('prefix'))
 conf_data.set_quoted('SYSCONFDIR', join_paths(get_option('prefix'), get_option('sysconfdir')))
 conf_data.set_quoted('SUID_WRAPPER_DIR', join_paths(get_option('prefix'), get_option('libexecdir')))
+conf_data.set_quoted('COMPILEDDEFAULTFONTPATH', get_option('default_font_path'))
 
-# XXX: Stopped enumerating at COMPILEDEFAULTFONTPATH
 conf_data.set('XORG_VERSION_CURRENT', release)
 
 conf_data.set('HASXDMAUTH', get_option('xdm-auth-1'))
diff --git a/meson_options.txt b/meson_options.txt
index dede8562a3..143228c5c9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -21,6 +21,8 @@ option('builder_string', type: 'string', description: 'Additional builder string
 option('log_dir', type: 'string')
 option('module_dir', type: 'string',
        description: 'X.Org modules directory')
+option('default_font_path', type: 'string',
+       value: 'catalogue:/etc/X11/fontpath.d,built-ins')
 
 option('glx', type: 'boolean', value: true)
 option('xdmcp', type: 'boolean', value: true)
-- 
2.16.2