aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Merge pull request #312 from konsolebox/remove_extra_dirs

Browse Source 
Don't specify extra dirs when callng find_library
This commit is contained in:
rkd77 2024-06-03 15:35:17 +02:00 committed by GitHub
commit a1e2684b3a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meson.build
View File

@ -403,7 +403,7 @@ deps = []
if conf_data.get('CONFIG_GZIP')
zdeps = dependency('zlib', static: st, required: false)
if not zdeps.found()
zdeps = compiler.find_library('z', static: st, dirs: [get_option('prefix')+'/lib'])
zdeps = compiler.find_library('z', static: st)
endif
if zdeps.found()
deps += zdeps
@ -447,7 +447,7 @@ ssldeps = []
if conf_data.get('CONFIG_OPENSSL')
ssldeps = dependency('openssl', static: st, required: false)
if not ssldeps.found()
ssldeps = compiler.find_library('ssl', static: st, dirs: [get_option('prefix')+'/lib'])
ssldeps = compiler.find_library('ssl', static: st)
endif
deps += ssldeps
conf_data.set('USE_OPENSSL', true)
@ -499,7 +499,7 @@ endif
if conf_data.get('CONFIG_BZIP2')
bz2deps = dependency('bzip2', static: st, required: false)
if not bz2deps.found()
bz2deps = compiler.find_library('bz2', static: st, dirs: [get_option('prefix')+'/lib'])
bz2deps = compiler.find_library('bz2', static: st)
endif
deps += bz2deps
endif
@ -520,7 +520,7 @@ curldeps = false
if conf_data.get('CONFIG_ECMASCRIPT_SMJS') or conf_data.get('CONFIG_QUICKJS') or conf_data.get('CONFIG_MUJS')
curldeps = dependency('libcurl', static: st, required: false)
if not curldeps.found()
curldeps = compiler.find_library('curl', static: st, dirs: [get_option('prefix')+'/lib'])
curldeps = compiler.find_library('curl', static: st)
endif
if curldeps.found()
deps += curldeps
@ -531,7 +531,7 @@ endif
if not conf_data.get('CONFIG_LIBCURL') and get_option('libcurl')
curldeps = dependency('libcurl', static: st, required: false)
if not curldeps.found()
curldeps = compiler.find_library('curl', static: st, dirs: [get_option('prefix')+'/lib'])
curldeps = compiler.find_library('curl', static: st)
endif
if curldeps.found()
deps += curldeps
@ -583,7 +583,7 @@ endif
if conf_data.get('CONFIG_SCRIPTING_LUA')
luadeps = dependency(luapkg, static: st, required: false)
if not luadeps.found()
luadeps = compiler.find_library(luapkg, static: st, dirs: [get_option('prefix')+'/lib'])
luadeps = compiler.find_library(luapkg, static: st)
endif
deps += luadeps
endif
@ -591,7 +591,7 @@ endif
if conf_data.get('CONFIG_XBEL_BOOKMARKS')
expatdeps = dependency('expat', static: st, required: false)
if not expatdeps.found()
expatdeps = compiler.find_library('expat', static: st, dirs: [get_option('prefix')+'/lib'])
expatdeps = compiler.find_library('expat', static: st)
endif
deps += expatdeps
endif
@ -662,7 +662,7 @@ endif
if conf_data.get('CONFIG_QUICKJS')
quickjsdeps = compiler.find_library('quickjs', static: st, required: false)
if not quickjsdeps.found()
quickjsdeps = compiler.find_library('quickjs/libquickjs', static: true, dirs: [get_option('prefix')+'/lib'])
quickjsdeps = compiler.find_library('quickjs/libquickjs', static: true)
endif
deps += quickjsdeps
deps += dep_atomic
@ -691,7 +691,7 @@ if conf_data.get('CONFIG_LIBSIXEL')
endif
if conf_data.get('CONFIG_OS_DOS')
wattdeps = compiler.find_library('watt', static: st, dirs: [get_option('prefix')+'/lib'])
wattdeps = compiler.find_library('watt', static: st)
deps += wattdeps
else
wattdeps = []
@ -1060,7 +1060,7 @@ if compiler.has_function('ASN1_STRING_get0_data', prefix: '#include <openssl/asn
conf_data.set('HAVE_ASN1_STRING_GET0_DATA', 1)
endif
iconvdeps = compiler.find_library('iconv', static: st, dirs: [get_option('prefix')+'/lib'], required: false)
iconvdeps = compiler.find_library('iconv', static: st, required: false)
if iconvdeps.found()
deps += iconvdeps
endif