aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-01-03 14:57:44 -05:00
Code

[meson] allow to find curl without pkgconfig

Browse Source 
Especially for curl for Windows.
This commit is contained in:
Witold Filipczyk 2023-11-06 19:03:14 +01:00
parent bb713a0cf8
commit bada330202
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meson.build
View File

@ -356,7 +356,10 @@ gnutlsdeps = []
ssldeps = [] ssldeps = []
if conf_data.get('CONFIG_OPENSSL') if conf_data.get('CONFIG_OPENSSL')
ssldeps = dependency('openssl', static: st) ssldeps = dependency('openssl', static: st, required: false)
if not ssldeps.found()
ssldeps = compiler.find_library('ssl', static: st, dirs: [get_option('prefix')+'/lib', '/usr/local/lib'])
endif
deps += ssldeps deps += ssldeps
conf_data.set('USE_OPENSSL', true) conf_data.set('USE_OPENSSL', true)
conf_data.set('CONFIG_GNUTLS', false) conf_data.set('CONFIG_GNUTLS', false)
@ -432,7 +435,10 @@ if conf_data.get('CONFIG_ECMASCRIPT_SMJS') or conf_data.get('CONFIG_QUICKJS') or
endif endif
if not conf_data.get('CONFIG_LIBCURL') and get_option('libcurl') if not conf_data.get('CONFIG_LIBCURL') and get_option('libcurl')
curldeps = dependency('libcurl', static: st) curldeps = dependency('libcurl', static: st, required: false)
if not curldeps.found()
curldeps = compiler.find_library('curl', static: st, dirs: [get_option('prefix')+'/lib', '/usr/local/lib'])
endif
deps += curldeps deps += curldeps
conf_data.set('CONFIG_LIBCURL', true) conf_data.set('CONFIG_LIBCURL', true)
endif endif