qulogic/pidgin

Merged in CMaiku/pidgin (pull request #351)

2018-05-24, Gary Kramlich
dafd11a1098a
Parents 55afb1512cfec189b8dbd56e
Children 2bbce9fbb527
Merged in CMaiku/pidgin (pull request #351)

meson: Update Cyrus SASL dependency to use pkg-config

Approved-by: Eion Robb
Approved-by: Elliott Sales de Andrade
Approved-by: Gary Kramlich
1 files changed, 9 insertions(+), 5 deletions(-)
  • +9 -5
    meson.build
    • --- a/meson.build Wed May 23 13:27:30 2018 -0500
    +++ b/meson.build Thu May 24 14:42:02 2018 +0000
    @@ -1000,11 +1000,15 @@
    endforeach
    enable_cyrus_sasl = get_option('cyrus-sasl')
    if enable_cyrus_sasl
    - if compiler.has_function('sasl_client_init', args : '-lsasl2')
    - conf.set('HAVE_CYRUS_SASL', true)
    - sasl = declare_dependency(link_args : '-lsasl2')
    - else
    - error('Cyrus SASL library not found')
    + sasl = dependency('libsasl2', version : '>= 2.0', required : false)
    + enable_cyrus_sasl = sasl.found()
    + conf.set('HAVE_CYRUS_SASL', enable_cyrus_sasl)
    +
    + if not enable_cyrus_sasl and force_deps
    + error('''
    +Cyrus SASL library not found
    +Use -Dcyrus-sasl=false if you do not need it.
    +''')
    endif
    else
    enable_cyrus_sasl = false