From ba16f16e4d5ac01690f9c2140c1f6682affd27cb Mon Sep 17 00:00:00 2001 From: emersion Date: Fri, 18 Jan 2019 08:21:43 +0100 Subject: [PATCH] meson: add gdk-pixbuf and man-pages options --- meson.build | 5 ++--- meson_options.txt | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 8acf0f2c..1318ce8f 100644 --- a/meson.build +++ b/meson.build @@ -46,7 +46,7 @@ xkbcommon = dependency('xkbcommon') cairo = dependency('cairo') pango = dependency('pango') pangocairo = dependency('pangocairo') -gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: false) +gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf')) pixman = dependency('pixman-1') libevdev = dependency('libevdev') libinput = dependency('libinput', version: '>=1.6.0') @@ -80,8 +80,7 @@ if not systemd.found() and not elogind.found() warning('You must do this manually post-install: chmod a+s /path/to/sway') endif -scdoc = find_program('scdoc', required: false) - +scdoc = find_program('scdoc', required: get_option('man-pages')) if scdoc.found() sh = find_program('sh') mandir = get_option('mandir') diff --git a/meson_options.txt b/meson_options.txt index 81eee66f..836d171a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -7,3 +7,5 @@ option('bash-completions', type: 'boolean', value: true, description: 'Install b option('fish-completions', type: 'boolean', value: true, description: 'Install fish shell completions.') option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications') option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray') +option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats in swaybg') +option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')