meson: rename options file
Meson supports the options being in a `meson.options` instead of a
generic text file so leverage this option. Use of `meson.options`
requires at least meson v1.1.0, but that in turn yields an issue with
the options file:
```
meson.options:2: WARNING: Project targets '>=1.1.0' but uses feature deprecated since '1.1.0': "boolean option" keyword argument "value" of type str. use a boolean, not a string
```
Fix all of these issues together.
Change-Id: Idebe8f5ccd2d7ba2dbb0a45a274deac0c1fd327d
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index 5b66368..06a7200 100644
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,7 @@
'tests=' + (meson.is_subproject() ? 'false' : 'true'),
],
version: '1.1.0',
- meson_version: '>=0.63.0',
+ meson_version: '>=1.1.0',
)
add_project_arguments('-D_GNU_SOURCE', language: 'c')
diff --git a/meson_options.txt b/meson.options
similarity index 65%
rename from meson_options.txt
rename to meson.options
index 838b5ef..d8837f2 100644
--- a/meson_options.txt
+++ b/meson.options
@@ -1,4 +1,4 @@
option('udev', type: 'feature', description: 'Install console udev rules')
-option('concurrent-servers', type: 'boolean', value: 'false', description: 'Support multiple concurrent obmc-console instances')
+option('concurrent-servers', type: 'boolean', value: false, description: 'Support multiple concurrent obmc-console instances')
option('ssh', type: 'feature', description: 'Support obmc-console-ssh and obmc-console-ssh-socket')
option('tests', type: 'boolean', description: 'Enable the test suite')