[glib: 4/4] Merge branch 'autodetect-iconv-impl' into 'master'

[Nirbheek Chauhan <nirbheekc src gnome org>]

commit 61c4531b457feff17bcc87328fb4f3ee603c4386
Merge: eefe43582 17823fa82
Author: Nirbheek Chauhan <nirbheek chauhan gmail com>
Date:   Fri Apr 12 06:02:45 2019 +0000

    Merge branch 'autodetect-iconv-impl' into 'master'
    
    meson: Add autodetection to the iconv combo option
    
    Closes #1557
    
    See merge request GNOME/glib!759

 .gitlab-ci.yml    |  8 +++++---
 glib/gconvert.c   |  8 --------
 meson.build       | 43 ++++++++++++++++---------------------------
 meson_options.txt |  6 +++---
 4 files changed, 24 insertions(+), 41 deletions(-)
---