Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 47caa71

Browse files
committed
meson: Pass more feature option through to required kwargs
That was already done in a lot of places, but not all. Backpatch this to keep the the meson files aligned as long as reasonably possible. Author: Tristan Partin <tristan@neon.tech> Reviewed-by: Andres Freund <andres@anarazel.de> Discussion: https://postgr.es/m/CSPIJVUDZFKX.3KHMOAVGF94RV@c3po Backpatch: 16-, where meson support was added
1 parent 2eaa54d commit 47caa71

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

meson.build

+8-8
Original file line numberDiff line numberDiff line change
@@ -773,8 +773,8 @@ endif
773773

774774
icuopt = get_option('icu')
775775
if not icuopt.disabled()
776-
icu = dependency('icu-uc', required: icuopt.enabled())
777-
icu_i18n = dependency('icu-i18n', required: icuopt.enabled())
776+
icu = dependency('icu-uc', required: icuopt)
777+
icu_i18n = dependency('icu-i18n', required: icuopt)
778778

779779
if icu.found()
780780
cdata.set('USE_ICU', 1)
@@ -1058,9 +1058,9 @@ endif
10581058
pyopt = get_option('plpython')
10591059
if not pyopt.disabled()
10601060
pm = import('python')
1061-
python3_inst = pm.find_installation(required: pyopt.enabled())
1062-
python3_dep = python3_inst.dependency(embed: true, required: pyopt.enabled())
1063-
if not cc.check_header('Python.h', dependencies: python3_dep, required: pyopt.enabled())
1061+
python3_inst = pm.find_installation(required: pyopt)
1062+
python3_dep = python3_inst.dependency(embed: true, required: pyopt)
1063+
if not cc.check_header('Python.h', dependencies: python3_dep, required: pyopt)
10641064
python3_dep = not_found_dep
10651065
endif
10661066
else
@@ -1083,7 +1083,7 @@ if not get_option('readline').disabled()
10831083
readline = dependency(readline_dep, required: false)
10841084
if not readline.found()
10851085
readline = cc.find_library(readline_dep,
1086-
required: get_option('readline').enabled(),
1086+
required: get_option('readline'),
10871087
dirs: test_lib_d)
10881088
endif
10891089
if readline.found()
@@ -1382,7 +1382,7 @@ if not zlibopt.disabled()
13821382
warning('did not find zlib')
13831383
elif not cc.has_header('zlib.h',
13841384
args: test_c_args, include_directories: postgres_inc,
1385-
dependencies: [zlib_t], required: zlibopt.enabled())
1385+
dependencies: [zlib_t], required: zlibopt)
13861386
warning('zlib header not found')
13871387
elif not cc.has_type('z_streamp',
13881388
dependencies: [zlib_t], prefix: '#include <zlib.h>',
@@ -2519,7 +2519,7 @@ if not nlsopt.disabled()
25192519
# otherwise there'd be lots of
25202520
# "Gettext not found, all translation (po) targets will be ignored."
25212521
# warnings if not found.
2522-
msgfmt = find_program('msgfmt', required: nlsopt.enabled(), native: true)
2522+
msgfmt = find_program('msgfmt', required: nlsopt, native: true)
25232523

25242524
# meson 0.59 has this wrapped in dependency('intl')
25252525
if (msgfmt.found() and

0 commit comments

Comments
 (0)