summaryrefslogtreecommitdiff
path: root/meson_options.txt
diff options
context:
space:
mode:
authorSven Eden <yamakuzure@gmx.net>2018-08-10 17:41:29 +0200
committerSven Eden <yamakuzure@gmx.net>2018-08-24 16:47:08 +0200
commit48d68297393c8b3699dd1ccabfe2e30b84c0a624 (patch)
tree013f7e15a1e949782803a64002ef188ee3b8d1c4 /meson_options.txt
parent11a069d1c3a71ea239275b1a1122d48ef9c45fb1 (diff)
Build system: Fix various issues that came from errornous migration.
No matter how much advanced check_tree.pl is, there are plenty possibilities where upstream changes can be transported wrong. Mainly adding something we then have to mask out. But at the end of the day this is actually wanted, so we do not miss important changes.
Diffstat (limited to 'meson_options.txt')
-rw-r--r--meson_options.txt12
1 files changed, 7 insertions, 5 deletions
diff --git a/meson_options.txt b/meson_options.txt
index 487c43c55..37d434191 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -14,9 +14,11 @@ option('rootprefix', type : 'string',
# 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''')
+#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''')
@@ -77,8 +79,8 @@ option('kexec-path', type : 'string', description : 'path to kexec')
# 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)')
+option('debug', type : 'array', choices : ['elogind', 'hashmap', 'mmap-cache'], value : [],
+ description : 'enable extra debugging')
#endif // 0
option('utmp', type : 'boolean',