NEWS: document that the BLS is now part of our tree

[elogind.git] / meson_options.txt

diff --git a/meson_options.txt b/meson_options.txt
index 3536f3ddf04ef93dd4c93e13ad3a683cb6ae2737..3ff9e5d2889cbe10deefe6361c7dc8b8d1d76545 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,20 +1,5 @@
 # -*- mode: meson -*-
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright 2017 Zbigniew Jędrzejewski-Szmek
-#
-# elogind is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# elogind is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with elogind; If not, see <http://www.gnu.org/licenses/>.
 
 option('split-usr', type : 'combo', choices : ['auto', 'true', 'false'],
        description : '''/bin, /sbin aren't symlinks into /usr''')
@@ -27,6 +12,14 @@ option('rootprefix', type : 'string',
 #if 0 /// UNNEEDED by elogind
 # option('link-udev-shared', type : 'boolean',
 #        description : 'link systemd-udev and its helpers to libsystemd-shared.so')
+# option('link-systemctl-shared', type: 'boolean',
+#        description : 'link systemctl against libsystemd-shared.so')
+# option('static-libsystemd', type : 'combo',
+#        choices : ['false', 'true', 'pic', 'no-pic'],
+#        description : '''install a static library for libsystemd''')
+# option('static-libudev', type : 'combo',
+#        choices : ['false', 'true', 'pic', 'no-pic'],
+#        description : '''install a static library for libudev''')
 # 
 # option('sysvinit-path', type : 'string', value : '/etc/init.d',
 #        description : 'the directory where the SysV init scripts are located')
@@ -60,8 +53,9 @@ option('udevbindir', type : 'string',
 option('docdir', type : 'string', description : 'path where to install the documentation.')
 option('htmldir', type : 'string', description : 'path where to install the HTML documentation.')
 
-# We have no systemd-shutdown binary, so we need 'halt' and 'reboot'
+# We have no systemd-shutdown binary, so we need 'halt', 'reboot' and 'poweroff'
 option('halt-path', type : 'string', description : 'path to halt')
+option('poweroff-path', type : 'string', description : 'path to poweroff')
 option('reboot-path', type : 'string', description : 'path to reboot')
 #endif // 0
 option('kexec-path', type : 'string', description : 'path to kexec')
@@ -76,10 +70,12 @@ option('kexec-path', type : 'string', description : 'path to kexec')
 #        description : 'path to debug shell binary')
 # 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('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
+#        description : 'enable extra debugging')
 # option('memory-accounting-default', type : 'boolean',
 #        description : 'enable MemoryAccounting= by default')
+# option('valgrind', type : 'boolean', value : false,
+#        description : 'do extra operations to avoid valgrind warnings')
 #else
 option('debug', type : 'string',
        description : 'enable extra debugging (elogind,hashmap,mmap-cache)')
@@ -112,6 +108,8 @@ option('utmp', type : 'boolean',
 #        description : 'install the systemd-localed stack')
 # option('machined', type : 'boolean',
 #        description : 'install the systemd-machined stack')
+# option('portabled', type : 'boolean',
+#        description : 'install the systemd-portabled stack')
 # option('networkd', type : 'boolean',
 #        description : 'install the systemd-networkd stack')
 # option('timedated', type : 'boolean',
@@ -188,9 +186,10 @@ option('default-hierarchy', type : 'combo',
 #        description : 'time epoch for time clients')
 #else
        description : '''Wanted cgroup hierarchy if elogind has to be a cgroup controller:
-                "legacy"  assumes cgroups version 1 mounted on /sys/fs/cgroup
-                "hybrid"  assumes cgroups version 2 mounted on /sys/fs/cgroup/unified and
-                                  cgroups version 1 mounted on /sys/fs/cgroup.
+                "legacy"  assumes tmpfs mounted on /sys/fs/cgroup and cgroup on its
+                                  subfolders.
+                "hybrid"  assumes cgroups version 2 mounted on /sys/fs/cgroup/unified.
+                                  /sys/fs/cgroup is legacy, then.
                 "unified" assumes cgroups version 2 on /sys/fs/cgroup''')
 option('cgroup-controller', type : 'string',
        description : 'Name of the cgroup controller to use')
@@ -246,6 +245,10 @@ option('gshadow', type : 'boolean',
 #        description : 'default DNSSEC mode',
 #        choices : ['yes', 'allow-downgrade', 'no'],
 #        value : 'allow-downgrade')
+# option('default-dns-over-tls', type : 'combo',
+#        description : 'default DNS-over-TLS mode',
+#        choices : ['opportunistic', 'no'],
+#        value : 'no')
 # option('dns-servers', type : 'string',
 #        description : 'space-separated list of default DNS servers',
 #        value : '8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844')