Meson: Fix building conntest sample without curl

main
FeRD (Frank Dana) 1 year ago committed by Rosen Penev
parent 79eb7675d8
commit ebd4e44004

@ -68,13 +68,12 @@ if brotli_dep.found()
endif endif
if get_option('webready') if get_option('webready')
curl_dep = dependency('libcurl', disabler: true, required: get_option('curl')) curl_dep = dependency('libcurl', required: get_option('curl'))
web_dep = declare_dependency(dependencies: [curl_dep])
deps += web_dep
else else
curl_dep = dependency('', disabler: true, required: false) web_dep = dependency('', disabler: true, required: false)
endif curl_dep = web_dep
if curl_dep.found()
deps += curl_dep
endif endif
expat_dep = dependency('expat', disabler: true, required: get_option('xmp')) expat_dep = dependency('expat', disabler: true, required: get_option('xmp'))
@ -118,7 +117,7 @@ cdata.set('EXV_HAVE_XMP_TOOLKIT', expat_dep.found())
cdata.set('EXV_HAVE_BROTLI', brotli_dep.found()) cdata.set('EXV_HAVE_BROTLI', brotli_dep.found())
cdata.set('EXV_HAVE_ICONV', iconv_dep.found()) cdata.set('EXV_HAVE_ICONV', iconv_dep.found())
cdata.set('EXV_HAVE_LIBZ', zlib_dep.found()) cdata.set('EXV_HAVE_LIBZ', zlib_dep.found())
cdata.set('EXV_ENABLE_WEBREADY', get_option('webready')) cdata.set('EXV_ENABLE_WEBREADY', web_dep.found())
cdata.set('EXV_USE_CURL', curl_dep.found()) cdata.set('EXV_USE_CURL', curl_dep.found())
cdata.set('EXV_ENABLE_NLS', intl_dep.found()) cdata.set('EXV_ENABLE_NLS', intl_dep.found())
cdata.set('EXV_ENABLE_FILESYSTEM', true) cdata.set('EXV_ENABLE_FILESYSTEM', true)
@ -157,7 +156,7 @@ executable(
samples = { samples = {
'addmoddel': [], 'addmoddel': [],
'conntest': curl_dep, 'conntest': web_dep,
'convert-test': [], 'convert-test': [],
'easyaccess-test': [], 'easyaccess-test': [],
'exifcomment': [], 'exifcomment': [],

Loading…
Cancel
Save