From 659336af51caf9d1e0ef2101240da02007c6ea37 Mon Sep 17 00:00:00 2001 From: Martin Lund Date: Fri, 11 Mar 2022 15:28:29 +0100 Subject: [PATCH] Force dependency on libinih Configuration file support is considered a mandatory feature. --- meson_options.txt | 3 --- src/meson.build | 13 ++++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index ac7b9f9..ddb4225 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,3 @@ option('bashcompletiondir', type : 'string', description : 'Directory for bash completion scripts ["no" disables]') -option('configfile', - type: 'boolean', value: true, - description: 'Enable configuration file support') diff --git a/src/meson.build b/src/meson.build index dc3f890..c2512bf 100644 --- a/src/meson.build +++ b/src/meson.build @@ -10,16 +10,11 @@ tio_sources = [ 'options.c', 'misc.c', 'tty.c', - 'print.c' + 'print.c', + 'configfile.c' ] -# dependencies -if get_option('configfile') - inih = meson.get_compiler('c').find_library('inih') - tio_sources += 'configfile.c' -else - inih = dependency() -endif +tio_dep = dependency('inih', required: true) tio_c_args = [] @@ -36,7 +31,7 @@ endif executable('tio', tio_sources, c_args: tio_c_args, - dependencies: inih, + dependencies: tio_dep, install: true ) subdir('bash-completion')