[glib: 6/6] Merge branch 'wip/lantw/freebsd-meson-builds' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 262b153c411b21d93819fe10c6702ef89da24f11
Merge: 379e8fd22 a77790330
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Jun 11 10:53:10 2018 +0000

    Merge branch 'wip/lantw/freebsd-meson-builds' into 'master'
    
    Fix meson build files for FreeBSD
    
    See merge request GNOME/glib!73

 configure.ac                    |  2 ++
 gio/gdbusmessage.c              |  2 ++
 gio/kqueue/gkqueuefilemonitor.c |  2 +-
 gio/meson.build                 | 17 +++++++++++++++++
 gio/tests/meson.build           |  2 +-
 meson.build                     | 10 +++++++++-
 6 files changed, 32 insertions(+), 3 deletions(-)
---