From c89ac6672dd0b914d06f6fe07861300cdf613331 Mon Sep 17 00:00:00 2001 From: Tristan Partin Date: Wed, 17 May 2023 09:38:09 -0500 Subject: [PATCH postgres v1 11/17] Pass feature option through to required kwarg Meson understands this already. No need to convert it to a boolean. --- meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index e9e03d1ff5..83bc1c7b25 100644 --- a/meson.build +++ b/meson.build @@ -770,8 +770,8 @@ endif icuopt = get_option('icu') if not icuopt.disabled() - icu = dependency('icu-uc', required: icuopt.enabled()) - icu_i18n = dependency('icu-i18n', required: icuopt.enabled()) + icu = dependency('icu-uc', required: icuopt) + icu_i18n = dependency('icu-i18n', required: icuopt) if icu.found() cdata.set('USE_ICU', 1) @@ -1080,7 +1080,7 @@ if not get_option('readline').disabled() readline = dependency(readline_dep, required: false) if not readline.found() readline = cc.find_library(readline_dep, - required: get_option('readline').enabled(), + required: get_option('readline'), dirs: test_lib_d) endif if readline.found() @@ -2540,7 +2540,7 @@ if not nlsopt.disabled() # otherwise there'd be lots of # "Gettext not found, all translation (po) targets will be ignored." # warnings if not found. - msgfmt = find_program('msgfmt', required: nlsopt.enabled(), native: true) + msgfmt = find_program('msgfmt', required: nlsopt, native: true) # meson 0.59 has this wrapped in dependency('int') if (msgfmt.found() and -- Tristan Partin Neon (https://neon.tech)