diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-03-29 18:01:47 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-04-12 11:12:28 +0530 |
| commit | 2f066aeb51c9968a0b9e68277e53c67d9a4d03e0 (patch) | |
| tree | 5b29eea019f6ea16e367ca379eefd1dee7182735 /meson_options.txt | |
| parent | eefe435828d11cec50c680a222db9a0b745ade95 (diff) | |
| download | glib-2f066aeb51c9968a0b9e68277e53c67d9a4d03e0.tar.gz | |
meson: Add autodetection to the iconv combo option
Instead of requiring the user to specify which option to use, which
they will not really know, nor should they need to know.
Search for each type of iconv (in the C library, as a separate
native library, as the GNU implementation) by default.
Fixes https://gitlab.gnome.org/GNOME/glib/issues/1557
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meson_options.txt b/meson_options.txt index 897d06607..0841f6bfe 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -5,9 +5,9 @@ option('runtime_libdir', option('iconv', type : 'combo', - choices : ['libc', 'gnu', 'native'], - value : 'libc', - description : 'iconv implementation to use (\'libc\' = \'Part of the C stdlib\'; \'gnu\' = \'GNU\'s iconv\'; \'native\' = \'A separate iconv\')') + choices : ['auto', 'libc', 'native', 'gnu'], + value : 'auto', + description : 'iconv implementation to use (\'libc\' = \'Part of the C stdlib\'; \'gnu\' = \'GNU\'s iconv\'; \'native\' = \'A separate iconv\'; \'auto\' = \'Auto-detect which iconv is available\')') option('charsetalias_dir', type : 'string', |