Merge pull request #8314 from poettering/rearrange-stdio

[thirdparty/systemd.git] / meson_options.txt

diff --git a/meson_options.txt b/meson_options.txt
index 48ee3f52a4ca687cca089bec68e313d7b06b0af1..4efb422f906f6b57b1ede11a6a993bf77501b7d9 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -16,8 +16,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-option('split-usr', type : 'boolean', value : false,
-       description : '''assume that /bin, /sbin aren't symlinks into /usr''')
+option('split-usr', type : 'combo', choices : ['auto', 'true', 'false'],
+       description : '''/bin, /sbin aren't symlinks into /usr''')
+option('split-bin', type : 'combo', choices : ['auto', 'true', 'false'],
+       description : '''sbin is not a symlink to bin''')
 option('rootlibdir', type : 'string',
        description : '''[/usr]/lib/x86_64-linux-gnu or such''')
 option('rootprefix', type : 'string',
@@ -53,6 +55,8 @@ option('debug-tty', type : 'string', value : '/dev/tty9',
        description : 'specify the tty device for debug shell')
 option('debug', type : 'string',
        description : 'enable extra debugging (hashmap,mmap-cache)')
+option('memory-accounting-default', type : 'boolean',
+       description : 'enable MemoryAccounting= by default')
 
 option('utmp', type : 'boolean',
        description : 'support for utmp/wtmp log handling')
@@ -296,6 +300,14 @@ option('slow-tests', type : 'boolean', value : 'false',
 option('install-tests', type : 'boolean', value : 'false',
        description : 'install test executables')
 
+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'],
+       value : 'green',
+       description: 'color of the "OK" status message')
+
 option('oss-fuzz', type : 'boolean', value : 'false',
        description : 'build against oss-fuzz')
 option('llvm-fuzz', type : 'boolean', value : 'false',