pidgin/purple-plugin-pack

Fix switchspell build.
meson
2017-06-24, Elliott Sales de Andrade
8615fc119de6
Parents 2a5672f7cb7e
Children 9c58265711f3
Fix switchspell build.
2 files changed, 17 insertions(+), 7 deletions(-)
  • +8 -7
    meson.build
  • +9 -0
    switchspell/meson.build
    • --- a/meson.build Fri Jun 23 18:10:52 2017 -0400
    +++ b/meson.build Sat Jun 24 23:06:20 2017 -0400
    @@ -124,18 +124,18 @@
    BUILD_SWITCH_SPELL = false
    -if false and GTKSPELL.found()
    - #$PKG_CONFIG --static --libs gtkspell-2.0 | grep -q enchant
    - if ok
    +if GTKSPELL.found()
    + # FIXME: This is a hack that should not exist.
    + if run_command('pkg-config', '--static', '--libs', 'gtkspell-2.0').stdout().contains('enchant')
    ENCHANT = dependency('enchant', required : false)
    + ASPELL = []
    BUILD_SWITCH_SPELL = ENCHANT.found()
    conf.set('HAVE_ENCHANT', ENCHANT.found())
    else
    - if compiler.has_header('aspell.h')
    - ASPELL = compiler.find_library('aspell')
    - BUILD_SWITCH_SPELL = ASPELL.found()
    - endif
    + ASPELL = dependency('aspell', required : false)
    + ENCHANT = []
    + BUILD_SWITCH_SPELL = ASPELL.found()
    endif
    endif
    @@ -217,6 +217,7 @@
    #subdir('stress')
    subdir('sslinfo')
    subdir('stocker')
    +subdir('switchspell')
    subdir('timelog')
    subdir('translate')
    subdir('xchat-chats')
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/switchspell/meson.build Sat Jun 24 23:06:20 2017 -0400
    @@ -0,0 +1,9 @@
    +if BUILD_SWITCH_SPELL and PIDGIN.found()
    + switchspell = shared_module('switchspell',
    + 'switchspell.c',
    + dependencies : [ASPELL, ENCHANT, GTKSPELL, PIDGIN, GTK],
    + name_prefix : '',
    + install : true,
    + install_dir : PIDGIN_LIBDIR)
    + PP_PIDGIN_BUILD += 'switchspell'
    +endif