[glib: 8/8] Merge branch '1313-config-cleanups' into 'master'

[Xavier Claessens <xclaesse src gnome org>]

commit b2375471cc07d2e14ab398475438407a7eb977bc
Merge: 0d00713fb eeadd57a1
Author: Xavier Claessens <xclaesse gmail com>
Date:   Fri Aug 31 12:56:26 2018 +0000

    Merge branch '1313-config-cleanups' into 'master'
    
    More config.h fixups for Meson
    
    Closes #1313
    
    See merge request GNOME/glib!283

 README.win32    |  3 +--
 glib/gscanner.c |  5 -----
 meson.build     | 59 ++++++++++++++++++++++++++++++++++++++++++---------------
 3 files changed, 45 insertions(+), 22 deletions(-)
---