mirror of
https://gitlab.freedesktop.org/pulseaudio/pavucontrol.git
synced 2025-12-24 14:20:05 +01:00
Use meson feature for lynx
This means you don't have to explicitly disable the lynx option to build pavucontrol if you don't have lynx installed. Signed-off-by: Alfred Wingate <parona@protonmail.com>
This commit is contained in:
parent
66a3e147b0
commit
c9ae5ab0cb
3 changed files with 3 additions and 5 deletions
|
|
@ -15,7 +15,7 @@ if tidy.found()
|
||||||
test('XHTML documentation uses correct mark-up', tidy, args: ['-e', readme_html])
|
test('XHTML documentation uses correct mark-up', tidy, args: ['-e', readme_html])
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if with_lynx
|
if lynx.found()
|
||||||
custom_target(
|
custom_target(
|
||||||
'README',
|
'README',
|
||||||
input: readme_html,
|
input: readme_html,
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,6 @@ project('pavucontrol', 'cpp',
|
||||||
default_options : [ 'c_std=gnu11', 'cpp_std=c++17' ]
|
default_options : [ 'c_std=gnu11', 'cpp_std=c++17' ]
|
||||||
)
|
)
|
||||||
|
|
||||||
with_lynx = get_option('lynx')
|
|
||||||
|
|
||||||
cpp = meson.get_compiler('cpp')
|
cpp = meson.get_compiler('cpp')
|
||||||
|
|
||||||
gtkmm_dep = dependency('gtkmm-4.0', version : '>= 4.0', required : true)
|
gtkmm_dep = dependency('gtkmm-4.0', version : '>= 4.0', required : true)
|
||||||
|
|
@ -21,7 +19,7 @@ have_pulse_messaging_api = cpp.has_function('pa_context_send_message_to_object',
|
||||||
|
|
||||||
json_glib_dep = dependency('json-glib-1.0', required : have_pulse_messaging_api)
|
json_glib_dep = dependency('json-glib-1.0', required : have_pulse_messaging_api)
|
||||||
|
|
||||||
lynx = find_program('lynx', required: with_lynx)
|
lynx = find_program('lynx', required: get_option('lynx'))
|
||||||
tidy = find_program('tidy', required: false)
|
tidy = find_program('tidy', required: false)
|
||||||
|
|
||||||
configinc = include_directories('.')
|
configinc = include_directories('.')
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
option('lynx',
|
option('lynx',
|
||||||
type : 'boolean', value : true,
|
type : 'feature', value : 'auto',
|
||||||
description : 'Enable building of the README text file for installation')
|
description : 'Enable building of the README text file for installation')
|
||||||
option('audio-feedback',
|
option('audio-feedback',
|
||||||
type : 'feature', value: 'auto',
|
type : 'feature', value: 'auto',
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue