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

Merge pull request #1075 from ailin-nemui/meson049

Browse Source 
do not use ?: to stay compatible with meson 0.49
This commit is contained in:
ailin-nemui 2019-07-21 00:21:39 +02:00 committed by GitHub
commit 05d50ffa1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
meson.build
View File

@ -112,7 +112,10 @@ default_theme_h = custom_target('default-theme.h',
#### inet_addr ####
inet_addr_found = false
foreach inet_addr_provider : ['', 'nsl']
prov_lib = inet_addr_provider != '' ? [cc.find_library(inet_addr_provider, required : false)] : []
prov_lib = []
if inet_addr_provider != ''
prov_lib += cc.find_library(inet_addr_provider, required : false)
endif
if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function('inet_addr', dependencies : prov_lib)
dep += prov_lib
inet_addr_found = true
@ -126,7 +129,10 @@ endif
#### socket ####
socket_found = false
foreach socket_provider : ['', 'socket', 'network']
prov_lib = socket_provider != '' ? [cc.find_library(socket_provider, required : false)] : []
prov_lib = []
if socket_provider != ''
prov_lib += cc.find_library(socket_provider, required : false)
endif
if (prov_lib.length() == 0 or prov_lib[0].found()) and cc.has_function('socket', dependencies : prov_lib)
dep += prov_lib
socket_found = true
@ -343,6 +349,11 @@ int main()
perl_library_dir += ' - prepends to @INC with /set perl_use_lib'
endif
endif
def_perl_use_lib = '-D' + 'PERL_USE_LIB' + '="'
if set_perl_use_lib
def_perl_use_lib += perl_use_lib
endif
def_perl_use_lib += '"'
have_perl = true
endif
@ -446,7 +457,11 @@ endif
##############
pc = import('pkgconfig')
pc.generate(filebase : 'irssi-1', name : 'Irssi', description : 'Irssi chat client', requires : glib_internal ? [] : glib_dep)
pc_requires = []
if not glib_internal
pc_requires += glib_dep
endif
pc.generate(filebase : 'irssi-1', name : 'Irssi', description : 'Irssi chat client', requires : pc_requires)
###########
# irssi.1 #

2
src/perl/meson.build
View File

@ -26,7 +26,7 @@ shared_module('perl_core',
],
c_args : [
def_scriptdir,
'-D' + 'PERL_USE_LIB' + '="' + (set_perl_use_lib ? perl_use_lib : '') + '"',
def_perl_use_lib,
'-D' + 'PERL_STATIC_LIBS' + '=' + 0.to_string(),
],
include_directories : rootinc,