diff options
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/meson_options.txt b/meson_options.txt index d1859e939..517d5757c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,13 +1,8 @@ option('runtime_libdir', type : 'string', value : '', - description : 'install runtime libraries relative to libdir') - -option('iconv', - type : 'combo', - choices : ['auto', 'libc', 'external'], - value : 'auto', - description : 'iconv implementation to use (\'libc\' = \'Part of the C library\'; \'external\' = \'External libiconv\'; \'auto\' = \'Auto-detect which iconv is available\')') + description : 'install runtime libraries relative to libdir', + deprecated: true) option('charsetalias_dir', type : 'string', @@ -19,6 +14,14 @@ option('gio_module_dir', value : '', description : 'load gio modules from this directory (default to \'libdir/gio/modules\' if unset)') +# FIXME: Deliberately not named runstatedir to avoid colliding with +# https://github.com/mesonbuild/meson/issues/4141; port to that when Meson +# supports it +option('runtime_dir', + type: 'string', + value: '', + description: 'Directory for transient runtime state [default: /run]') + option('selinux', type : 'feature', value : 'auto', @@ -116,4 +119,9 @@ option('glib_checks', option('libelf', type : 'feature', value : 'auto', - description : 'Enable support for listing and extracting from ELF resource files with gresource tool')
\ No newline at end of file + description : 'Enable support for listing and extracting from ELF resource files with gresource tool') + +option('multiarch', + type : 'boolean', + value : false, + description : 'Install some helper executables in per-architecture locations') |