aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meson.build5
-rw-r--r--meson_options.txt2
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')
46cairo = dependency('cairo') 46cairo = dependency('cairo')
47pango = dependency('pango') 47pango = dependency('pango')
48pangocairo = dependency('pangocairo') 48pangocairo = dependency('pangocairo')
49gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: false) 49gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf'))
50pixman = dependency('pixman-1') 50pixman = dependency('pixman-1')
51libevdev = dependency('libevdev') 51libevdev = dependency('libevdev')
52libinput = dependency('libinput', version: '>=1.6.0') 52libinput = 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')
81endif 81endif
82 82
83scdoc = find_program('scdoc', required: false) 83scdoc = find_program('scdoc', required: get_option('man-pages'))
84
85if scdoc.found() 84if 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
7option('fish-completions', type: 'boolean', value: true, description: 'Install fish shell completions.') 7option('fish-completions', type: 'boolean', value: true, description: 'Install fish shell completions.')
8option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications') 8option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications')
9option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray') 9option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray')
10option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats in swaybg')
11option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')