database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-21 15:54:08 +03:00
Code

meson: Pass more feature option through to required kwargs

Browse Source 
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
This commit is contained in:
Andres Freund 2023-07-12 16:26:03 -07:00
parent eeb28a2d94
commit 5a7280d988
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meson.build
View File

@ -769,8 +769,8 @@ endif
icuopt = get_option('icu') icuopt = get_option('icu')
if not icuopt.disabled() if not icuopt.disabled()
icu = dependency('icu-uc', required: icuopt.enabled()) icu = dependency('icu-uc', required: icuopt)
icu_i18n = dependency('icu-i18n', required: icuopt.enabled()) icu_i18n = dependency('icu-i18n', required: icuopt)
if icu.found() if icu.found()
cdata.set('USE_ICU', 1) cdata.set('USE_ICU', 1)
@ -1054,9 +1054,9 @@ endif
pyopt = get_option('plpython') pyopt = get_option('plpython')
if not pyopt.disabled() if not pyopt.disabled()
pm = import('python') pm = import('python')
python3_inst = pm.find_installation(required: pyopt.enabled()) python3_inst = pm.find_installation(required: pyopt)
python3_dep = python3_inst.dependency(embed: true, required: pyopt.enabled()) python3_dep = python3_inst.dependency(embed: true, required: pyopt)
if not cc.check_header('Python.h', dependencies: python3_dep, required: pyopt.enabled()) if not cc.check_header('Python.h', dependencies: python3_dep, required: pyopt)
python3_dep = not_found_dep python3_dep = not_found_dep
endif endif
else else
@ -1079,7 +1079,7 @@ if not get_option('readline').disabled()
readline = dependency(readline_dep, required: false) readline = dependency(readline_dep, required: false)
if not readline.found() if not readline.found()
readline = cc.find_library(readline_dep, readline = cc.find_library(readline_dep,
required: get_option('readline').enabled(), required: get_option('readline'),
dirs: test_lib_d) dirs: test_lib_d)
endif endif
if readline.found() if readline.found()
@ -1379,7 +1379,7 @@ if not zlibopt.disabled()
warning('did not find zlib') warning('did not find zlib')
elif not cc.has_header('zlib.h', elif not cc.has_header('zlib.h',
args: test_c_args, include_directories: postgres_inc, args: test_c_args, include_directories: postgres_inc,
dependencies: [zlib_t], required: zlibopt.enabled()) dependencies: [zlib_t], required: zlibopt)
warning('zlib header not found') warning('zlib header not found')
elif not cc.has_type('z_streamp', elif not cc.has_type('z_streamp',
dependencies: [zlib_t], prefix: '#include <zlib.h>', dependencies: [zlib_t], prefix: '#include <zlib.h>',
@ -2538,7 +2538,7 @@ if not nlsopt.disabled()
# otherwise there'd be lots of # otherwise there'd be lots of
# "Gettext not found, all translation (po) targets will be ignored." # "Gettext not found, all translation (po) targets will be ignored."
# warnings if not found. # 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('intl') # meson 0.59 has this wrapped in dependency('intl')
if (msgfmt.found() and if (msgfmt.found() and