[glib: 3/3] Merge branch 'fam' into 'master'

[Xavier Claessens <xclaesse src gnome org>]

commit b04142a24f8afdafd9717f0a543cb3902452cf05
Merge: a7e383b05 077e9f04c
Author: Xavier Claessens <xclaesse gmail com>
Date:   Thu Jun 7 15:18:38 2018 +0000

    Merge branch 'fam' into 'master'
    
    Meson: Build fam module
    
    See merge request GNOME/glib!71

 configure.ac                    |  3 +--
 gio/Makefile.am                 |  1 +
 gio/fam/gfamfilemonitor.map     |  8 ++++++++
 gio/fam/meson.build             | 36 ++++++++++++++++++++++++++++++++++++
 gio/gio-querymodules-wrapper.py |  9 +++++++++
 gio/meson.build                 |  9 +++------
 meson_options.txt               |  5 +++++
 7 files changed, 63 insertions(+), 8 deletions(-)
---