@ -773,8 +773,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 )
@ -1058,9 +1058,9 @@ endif
pyopt = get_option ( 'plpython' )
if not pyopt . disabled ( )
pm = import ( 'python' )
python3_inst = pm . find_installation ( required : pyopt . enabled ( ) )
python3_dep = python3_inst . dependency ( embed : true , required : pyopt . enabled ( ) )
if not cc . check_header ( 'Python.h' , dependencies : python3_dep , required : pyopt . enabled ( ) )
python3_inst = pm . find_installation ( required : pyopt )
python3_dep = python3_inst . dependency ( embed : true , required : pyopt )
if not cc . check_header ( 'Python.h' , dependencies : python3_dep , required : pyopt )
python3_dep = not_found_dep
endif
else
@ -1083,7 +1083,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 ( )
@ -1382,7 +1382,7 @@ if not zlibopt.disabled()
warning ( 'did not find zlib' )
elif not cc . has_header ( 'zlib.h' ,
args : test_c_args , include_directories : postgres_inc ,
dependencies : [ zlib_t ] , required : zlibopt . enabled ( ) )
dependencies : [ zlib_t ] , required : zlibopt )
warning ( 'zlib header not found' )
elif not cc . has_type ( 'z_streamp' ,
dependencies : [ zlib_t ] , prefix : '#include <zlib.h>' ,
@ -2519,7 +2519,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('intl')
if ( msgfmt . found ( ) and