@@ -68,13 +68,12 @@ if brotli_dep.found()
6868endif
6969
7070if get_option (' webready' )
71- curl_dep = dependency (' libcurl' , disabler : true , required : get_option (' curl' ))
71+ curl_dep = dependency (' libcurl' , required : get_option (' curl' ))
72+ web_dep = declare_dependency (dependencies : [curl_dep])
73+ deps += web_dep
7274else
73- curl_dep = dependency ('' , disabler : true , required : false )
74- endif
75-
76- if curl_dep.found()
77- deps += curl_dep
75+ web_dep = dependency ('' , disabler : true , required : false )
76+ curl_dep = web_dep
7877endif
7978
8079expat_dep = dependency (' expat' , disabler : true , required : get_option (' xmp' ))
@@ -118,7 +117,7 @@ cdata.set('EXV_HAVE_XMP_TOOLKIT', expat_dep.found())
118117cdata.set(' EXV_HAVE_BROTLI' , brotli_dep.found())
119118cdata.set(' EXV_HAVE_ICONV' , iconv_dep.found())
120119cdata.set(' EXV_HAVE_LIBZ' , zlib_dep.found())
121- cdata.set(' EXV_ENABLE_WEBREADY' , get_option ( ' webready ' ))
120+ cdata.set(' EXV_ENABLE_WEBREADY' , web_dep.found( ))
122121cdata.set(' EXV_USE_CURL' , curl_dep.found())
123122cdata.set(' EXV_ENABLE_NLS' , intl_dep.found())
124123cdata.set(' EXV_ENABLE_FILESYSTEM' , true )
@@ -157,7 +156,7 @@ executable(
157156
158157samples = {
159158 ' addmoddel' : [],
160- ' conntest' : curl_dep ,
159+ ' conntest' : web_dep ,
161160 ' convert-test' : [],
162161 ' easyaccess-test' : [],
163162 ' exifcomment' : [],
0 commit comments