picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

meson: default to use libidn2 if both libidn2 and libidn are installed

This commit is contained in:
Yu Watanabe 2019-06-29 03:13:30 +09:00
parent 6c092dbe43
commit 1b9313991b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meson.build
View File

@ -985,24 +985,24 @@ if want_libidn == 'true' and want_libidn2 == 'true'
error('libidn and libidn2 cannot be requested simultaneously')
endif
if want_libidn != 'false' and want_libidn2 != 'true' and not skip_deps
libidn = dependency('libidn',
required : want_libidn == 'true')
have = libidn.found()
else
have = false
libidn = []
endif
conf.set10('HAVE_LIBIDN', have)
if not have and want_libidn2 != 'false' and not skip_deps
# libidn is used for both libidn and libidn2 objects
if want_libidn2 != 'false' and want_libidn != 'true' and not skip_deps
libidn = dependency('libidn2',
required : want_libidn2 == 'true')
have = libidn.found()
else
have = false
libidn = []
endif
conf.set10('HAVE_LIBIDN2', have)
if not have and want_libidn != 'false' and not skip_deps
# libidn is used for both libidn and libidn2 objects
libidn = dependency('libidn',
required : want_libidn == 'true')
have = libidn.found()
else
have = false
endif
conf.set10('HAVE_LIBIDN', have)
want_libiptc = get_option('libiptc')
if want_libiptc != 'false' and not skip_deps