pidgin/purple-plugin-pack

The most recent talkfilters has a pc file, so check for that and don't make it required

2018-08-25, Gary Kramlich
35400c56dd2a
Parents 512fe2e39304
Children c07ac3e8d58b
The most recent talkfilters has a pc file, so check for that and don't make it required
2 files changed, 3 insertions(+), 20 deletions(-)
  • +0 -19
    meson.build
  • +3 -1
    talkfilters/meson.build
    • --- a/meson.build Fri Aug 24 00:08:22 2018 -0500
    +++ b/meson.build Sat Aug 25 17:17:39 2018 -0500
    @@ -92,25 +92,6 @@
    CAIRO = dependency('cairo', required : false)
    #######################################################################
    -# Check for talkfilters
    -#######################################################################
    -if compiler.has_header('talkfilters.h')
    - HAVE_TALKFILTERS = true
    -else
    - message('''
    -*** GNU Talk Filters is required to build the talkfilters plugin;
    -*** please make sure you have the GNU Talk Filters development headers installed.
    -*** The latest version of GNU Talk Filters is available at
    -*** http://www.hyperrealm.com/talkfilters/talkfilters.html.''')
    - HAVE_TALKFILTERS = false
    -endif
    -if HAVE_TALKFILTERS
    - # work out that the library exists
    - TALKFILTERS = compiler.find_library('talkfilters')
    - HAVE_TALKFILTERS = TALKFILTERS.found()
    -endif
    -
    -#######################################################################
    # Check for libjson-glib
    #######################################################################
    JSON_GLIB = dependency('json-glib-1.0', required : false)
    --- a/talkfilters/meson.build Fri Aug 24 00:08:22 2018 -0500
    +++ b/talkfilters/meson.build Sat Aug 25 17:17:39 2018 -0500
    @@ -1,4 +1,6 @@
    -if TYPES.contains('default') and PIDGIN.found() and HAVE_TALKFILTERS
    +TALKFILTERS = dependency('talkfilters', required : false)
    +
    +if TYPES.contains('default') and PIDGIN.found() and TALKFILTERS.found()
    talkfilters = shared_module('talkfilters',
    'talkfilters.c',
    dependencies : [TALKFILTERS, PIDGIN, GTK],