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

[Daniel Playfair Cal <danielplayfaircal src gnome org>]

commit 31faca1234ebb9b23c997d9ffebaa757a1f3e214
Merge: 7ff7c51 8c13a45
Author: Daniel Playfair Cal <daniel playfair cal gmail com>
Date:   Mon Feb 4 00:41:05 2019 +0000

    Merge branch 'optional-vapi' into 'master'
    
    build: Make dconf client vapi installation optional
    
    See merge request GNOME/dconf!40

 bin/meson.build    |  2 +-
 client/meson.build | 25 +++++++++++++++++++------
 meson.build        |  3 +--
 meson_options.txt  |  1 +
 4 files changed, 22 insertions(+), 9 deletions(-)
---