[gcab: 2/2] Merge branch 'optional-vapi' into 'master'

[Marc-André Lureau <malureau src gnome org>]

commit df29c0bd52da853157c42ed5dcaeaec08f05f476
Merge: 5619f4c 5ac7272
Author: Marc-André Lureau <marcandre lureau gmail com>
Date:   Wed Feb 13 16:46:01 2019 +0000

    Merge branch 'optional-vapi' into 'master'
    
    build-sys: Support disabling vapi generation independent of introspection
    
    See merge request GNOME/gcab!1

 libgcab/meson.build | 12 +++++++-----
 meson_options.txt   |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)
---