shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-11 04:58:19 +03:00
Code

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

Browse Source
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

22
meson.build

@ -985,24 +985,24 @@ if want_libidn == 'true' and want_libidn2 == 'true'
error('libidn and libidn2 cannot be requested simultaneously') error('libidn and libidn2 cannot be requested simultaneously')
endif endif
if want_libidn != 'false' and want_libidn2 != 'true' and not skip_deps if want_libidn2 != 'false' and want_libidn != '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
libidn = dependency('libidn2', libidn = dependency('libidn2',
required : want_libidn2 == 'true') required : want_libidn2 == 'true')
have = libidn.found() have = libidn.found()
else else
have = false have = false
libidn = []
endif endif
conf.set10('HAVE_LIBIDN2', have) 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') want_libiptc = get_option('libiptc')
if want_libiptc != 'false' and not skip_deps if want_libiptc != 'false' and not skip_deps