grim/pidgin

Merged in dynamic-prpls-fix (pull request #469)

2019-03-08, Gary Kramlich
ca0e443f89ca
Parents 07ad2a0fedd834ecb027100c
Children ac3af5f4cb4c
Merged in dynamic-prpls-fix (pull request #469)

Fix configuring a build for only a subset of plugins

Approved-by: Elliott Sales de Andrade
Approved-by: Gary Kramlich
4 files changed, 13 insertions(+), 11 deletions(-)
  • +3 -1
    doc/reference/protocols/meson.build
  • +6 -6
    libpurple/protocols/facebook/meson.build
  • +2 -2
    libpurple/protocols/jabber/meson.build
  • +2 -2
    libpurple/protocols/oscar/meson.build
    • --- a/doc/reference/protocols/meson.build Fri Mar 01 03:28:28 2019 +0000
    +++ b/doc/reference/protocols/meson.build Fri Mar 08 02:37:22 2019 +0000
    @@ -1,1 +1,3 @@
    -subdir('facebook')
    +if DYNAMIC_FACEBOOK
    + subdir('facebook')
    +endif
    --- a/libpurple/protocols/facebook/meson.build Fri Mar 01 03:28:28 2019 +0000
    +++ b/libpurple/protocols/facebook/meson.build Fri Mar 08 02:37:22 2019 +0000
    @@ -22,10 +22,10 @@
    facebook_prpl = shared_library('facebook', FACEBOOKSOURCES,
    dependencies : [json, libpurple_dep, glib],
    install : true, install_dir : PURPLE_PLUGINDIR)
    +
    + # Used to produce docs.
    + facebook_inc = include_directories('.')
    + facebook_dep = declare_dependency(
    + link_with : facebook_prpl,
    + dependencies : [json, libpurple_dep, glib])
    endif
    -
    -# Used to produce docs.
    -facebook_inc = include_directories('.')
    -facebook_dep = declare_dependency(
    - link_with : facebook_prpl,
    - dependencies : [json, libpurple_dep, glib])
    --- a/libpurple/protocols/jabber/meson.build Fri Mar 01 03:28:28 2019 +0000
    +++ b/libpurple/protocols/jabber/meson.build Fri Mar 08 02:37:22 2019 +0000
    @@ -120,6 +120,6 @@
    link_args : jabber_link_args,
    dependencies : [gstreamer, idn, libxml, sasl, libpurple_dep, glib, gio, math, ws2_32],
    install : true, install_dir : PURPLE_PLUGINDIR)
    +
    + subdir('tests')
    endif
    -
    -subdir('tests')
    --- a/libpurple/protocols/oscar/meson.build Fri Mar 01 03:28:28 2019 +0000
    +++ b/libpurple/protocols/oscar/meson.build Fri Mar 08 02:37:22 2019 +0000
    @@ -58,6 +58,6 @@
    link_args : oscar_link_args,
    dependencies : [libpurple_dep, glib, ws2_32],
    install : true, install_dir : PURPLE_PLUGINDIR)
    +
    + subdir('tests')
    endif
    -
    -subdir('tests')