diff options
-rw-r--r-- | meson.build | 5 | ||||
-rw-r--r-- | 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') | |||
46 | cairo = dependency('cairo') | 46 | cairo = dependency('cairo') |
47 | pango = dependency('pango') | 47 | pango = dependency('pango') |
48 | pangocairo = dependency('pangocairo') | 48 | pangocairo = dependency('pangocairo') |
49 | gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: false) | 49 | gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf')) |
50 | pixman = dependency('pixman-1') | 50 | pixman = dependency('pixman-1') |
51 | libevdev = dependency('libevdev') | 51 | libevdev = dependency('libevdev') |
52 | libinput = dependency('libinput', version: '>=1.6.0') | 52 | libinput = dependency('libinput', version: '>=1.6.0') |
@@ -80,8 +80,7 @@ if not systemd.found() and not elogind.found() | |||
80 | warning('You must do this manually post-install: chmod a+s /path/to/sway') | 80 | warning('You must do this manually post-install: chmod a+s /path/to/sway') |
81 | endif | 81 | endif |
82 | 82 | ||
83 | scdoc = find_program('scdoc', required: false) | 83 | scdoc = find_program('scdoc', required: get_option('man-pages')) |
84 | |||
85 | if scdoc.found() | 84 | if scdoc.found() |
86 | sh = find_program('sh') | 85 | sh = find_program('sh') |
87 | mandir = get_option('mandir') | 86 | 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 | |||
7 | option('fish-completions', type: 'boolean', value: true, description: 'Install fish shell completions.') | 7 | option('fish-completions', type: 'boolean', value: true, description: 'Install fish shell completions.') |
8 | option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications') | 8 | option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications') |
9 | option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray') | 9 | option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray') |
10 | option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats in swaybg') | ||
11 | option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages') | ||