diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-04-04 05:12:35 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-04-12 11:12:28 +0530 |
| commit | ace32cd8e2a012f33ebd780e53631b5a2cd03c23 (patch) | |
| tree | a481d6a9b54b78506c37ffffdda919498da94202 /meson_options.txt | |
| parent | 2f066aeb51c9968a0b9e68277e53c67d9a4d03e0 (diff) | |
| download | glib-ace32cd8e2a012f33ebd780e53631b5a2cd03c23.tar.gz | |
gconvert: Don't differentiate between GNU iconv and macOS iconv
Both provide iconv_open, and in fact, we weren't using the difference
anywhere in glib at all.
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meson_options.txt b/meson_options.txt index 0841f6bfe..2c831e37e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -5,9 +5,9 @@ option('runtime_libdir', option('iconv', type : 'combo', - choices : ['auto', 'libc', 'native', 'gnu'], + choices : ['auto', 'libc', 'external'], 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\')') + description : 'iconv implementation to use (\'libc\' = \'Part of the C library\'; \'external\' = \'External libiconv\'; \'auto\' = \'Auto-detect which iconv is available\')') option('charsetalias_dir', type : 'string', |