From 6826c60da5d1eee203ffe5d6b239838972678828 Mon Sep 17 00:00:00 2001 From: Arnaud Rebillout Date: Mon, 5 Nov 2018 12:03:03 +0700 Subject: [PATCH] meson: Make man page build and install conditional Signed-off-by: Arnaud Rebillout --- man/meson.build | 11 ++++------- meson.build | 5 ++++- meson_options.txt | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/man/meson.build b/man/meson.build index 23dd9fe5b..ef483c7ad 100644 --- a/man/meson.build +++ b/man/meson.build @@ -20,17 +20,14 @@ manpages = [ # FIXME: Add esdcompat if HAVE_ESOUND #manpages += ['esdcompat', '1'], -# FIXME: This should be conditional -want_man = true - man_data = configuration_data() man_data.set('PACKAGE_URL', 'http://pulseaudio.org/') man_data.set('PACKAGE_BUGREPORT', 'pulseaudio-discuss (at) lists (dot) freedesktop (dot) org') man_data.set('PA_DEFAULT_CONFIG_DIR', cdata.get_unquoted('PA_DEFAULT_CONFIG_DIR')) -perl = find_program('perl', required: want_man == true) +perl = find_program('perl', required: true) xmltoman_cmd = [perl, join_paths(meson.current_source_dir(), 'xmltoman')] -xmllint = find_program('xmllint', required: want_man == true) +xmllint = find_program('xmllint', required: false) foreach tuple : manpages stem = tuple[0] @@ -55,7 +52,7 @@ foreach tuple : manpages output : man, capture : true, command : xmltoman_cmd + ['@INPUT@'], - install : want_man, + install : true, install_dir : mandirn, ) @@ -64,7 +61,7 @@ foreach tuple : manpages alias, output : alias, command : ['ln', '-fs', man, '@OUTPUT@'], - install : want_man, + install : true, install_dir : mandirn, ) endforeach diff --git a/meson.build b/meson.build index f4449b81e..2c21cce71 100644 --- a/meson.build +++ b/meson.build @@ -434,7 +434,9 @@ check_dep = dependency('check', version : '>= 0.9.10', required : get_option('te # Now generate config.h from everything above configure_file(output : 'config.h', configuration : cdata) -subdir('man') +if get_option('man') + subdir('man') +endif subdir('shell-completion/bash') subdir('shell-completion/zsh') subdir('src') @@ -500,6 +502,7 @@ summary = [ 'Enable SoXR (resampler): @0@'.format(soxr_dep.found()), 'Enable WebRTC echo canceller: @0@'.format(webrtc_dep.found()), # 'Enable gcov coverage: @0@'.format(${ENABLE_GCOV}), + 'Enable man pages: @0@'.format(get_option('man')), 'Enable unit tests: @0@'.format(get_option('tests')), '', 'Database: @0@'.format(get_option('database')), diff --git a/meson_options.txt b/meson_options.txt index fadd587f1..d2a7155b7 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,6 @@ +option('man', + type : 'boolean', + description : 'Enable building and installation of man pages') option('tests', type : 'boolean', description : 'Enable unit tests') -- 2.34.1