X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=meson_options.txt;h=05f80ba1a7320c2eba9ee099ea97336ef23fa743;hb=8cc96e787c3d6f6d12ee5a58e2b7a59ca9a1a21b;hp=cf093a615d1eb930d19da55ac9c4b6ad989ae800;hpb=1fa1ee057d4c0cdd6ee3b0af99ed9c2bbddc1613;p=elogind.git

diff --git a/meson_options.txt b/meson_options.txt
index cf093a615..05f80ba1a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,7 +1,5 @@
 # -*- mode: meson -*-
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright 2017 Zbigniew Jędrzejewski-Szmek
 
 option('split-usr', type : 'combo', choices : ['auto', 'true', 'false'],
        description : '''/bin, /sbin aren't symlinks into /usr''')
@@ -14,9 +12,13 @@ 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('static-libsystemd', type : 'combo',
-#        choices : ['false', 'true', 'pic', 'no-pic'],
-#        description : '''install a static library for libsystemd''')
+# option('link-systemctl-shared', type: 'boolean',
+#        description : 'link systemctl against libsystemd-shared.so')
+#endif // 0
+option('static-libelogind', type : 'combo',
+       choices : ['false', 'true', 'pic', 'no-pic'],
+       description : '''install a static library for libelogind''')
+#if 0 /// UNNEEDED by elogind
 # option('static-libudev', type : 'combo',
 #        choices : ['false', 'true', 'pic', 'no-pic'],
 #        description : '''install a static library for libudev''')
@@ -70,16 +72,17 @@ 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 : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
+# option('debug-extra', 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)')
 #endif // 0
+option('valgrind', type : 'boolean', value : false,
+       description : 'do extra operations to avoid valgrind warnings')
+#if 1 /// Add an extra debugging option for elogind
+option('debug-extra', type : 'array', choices : ['elogind', 'hashmap', 'mmap-cache'], value : [],
+       description : 'enable extra debugging')
+#endif // 1
 
 option('utmp', type : 'boolean',
        description : 'support for utmp/wtmp log handling')
@@ -245,6 +248,12 @@ 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-over-tls', type : 'combo', choices : ['auto', 'true', 'false'],
+#        description : 'DNS-over-TLS support')
 # 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')