Build system: Fix various issues that came from errornous migration.

[elogind.git] / meson_options.txt

diff --git a/meson_options.txt b/meson_options.txt
index 487c43c555e134856cf6b458dd2e4110157a9aa6..37d434191535d9cd7b52fd09f4d493fe6fd11b44 100644 (file)
--- 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',