Skip to content

Commit

Permalink
Meson: Fix building conntest sample without curl
Browse files Browse the repository at this point in the history
(cherry picked from commit ebd4e44)
  • Loading branch information
ferdnyc authored and kmilos committed May 17, 2024
1 parent ad3e0f9 commit ca35182
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,12 @@ if brotli_dep.found()
endif

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
curl_dep = dependency('', disabler: true, required: false)
endif

if curl_dep.found()
deps += curl_dep
web_dep = dependency('', disabler: true, required: false)
curl_dep = web_dep
endif

expat_dep = dependency('expat', disabler: true, required: get_option('xmp'))
Expand Down Expand Up @@ -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_ICONV', iconv_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_ENABLE_NLS', intl_dep.found())

Expand Down Expand Up @@ -156,7 +155,7 @@ executable(

samples = {
'addmoddel': [],
'conntest': curl_dep,
'conntest': web_dep,
'convert-test': [],
'easyaccess-test': [],
'exifcomment': [],
Expand Down

0 comments on commit ca35182

Please sign in to comment.