meson: use dashes in colour names

diff --git a/meson.build b/meson.build
index 5aa46cd579167c19cdcb7e55c5198e6b4b9067e4..d9308c28bca42a141510b3c1fa4addc4e6fbb7f5 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -183,7 +183,7 @@ conf.set_quoted('SYSTEM_SYSVRCND_PATH',                       sysvrcnd_path)
 conf.set_quoted('RC_LOCAL_SCRIPT_PATH_START',                 get_option('rc-local'))
 conf.set_quoted('RC_LOCAL_SCRIPT_PATH_STOP',                  get_option('halt-local'))
 
-conf.set('ANSI_OK_COLOR', 'ANSI_' + get_option('ok-color').to_upper())
+conf.set('ANSI_OK_COLOR',                                     'ANSI_' + get_option('ok-color').underscorify().to_upper())
 
 conf.set_quoted('USER_CONFIG_UNIT_PATH',                      join_paths(pkgsysconfdir, 'user'))
 conf.set_quoted('USER_DATA_UNIT_PATH',                        userunitdir)

diff --git a/meson_options.txt b/meson_options.txt
index 59fb20b0a49bcab7520f06ceb6e5e4d8bc5f9b2b..cdd7edd450c9904b8adb09c0b299aa104a79e23b 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -300,9 +300,9 @@ option('install-tests', type : 'boolean', value : 'false',
 
 option('ok-color', type: 'combo',
        choices : ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan',
-                  'white', 'highlight_black', 'highlight_red', 'highlight_green',
-                  'highlight_yellow', 'highlight_blue', 'highlight_magenta',
-                  'highlight_cyan', 'highlight_white'],
+                  'white', 'highlight-black', 'highlight-red', 'highlight-green',
+                  'highlight-yellow', 'highlight-blue', 'highlight-magenta',
+                  'highlight-cyan', 'highlight-white'],
        value : 'green',
        description: 'color of the "OK" status message')