[glib: 2/2] Merge branch 'm4macros' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 3b10fc035ddc974c3b8e279368102d48ca42f95a
Merge: fce9444e6 4bb16f484
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Oct 8 22:43:46 2018 +0000

    Merge branch 'm4macros' into 'master'
    
    m4macros: Allow information from pkg-config to be overridden
    
    See merge request GNOME/glib!375

 m4macros/glib-2.0.m4  | 33 +++++++++++++++++----------------
 m4macros/gsettings.m4 | 14 ++++++++------
 2 files changed, 25 insertions(+), 22 deletions(-)
---