Prep v239: Mask unneeded test in test-strip-ansi

[elogind.git] / meson.build

diff --git a/meson.build b/meson.build
index 3d61b8e0271209e056574da111fd9769bf70bbc7..550d7a6743e6239578c80324a5c67a56558d0b89 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -204,6 +204,12 @@ if dbussystemservicedir == ''
         dbussystemservicedir = join_paths(datadir, 'dbus-1/system-services')
 endif
 
+#if 1 /// Will elogind find system_bus_socket in /run/dbus or /var/run/dbus ?
+varrunissymllink = run_command('test', '-L', '/var/run').returncode() == 0
+message('Setting VARRUN_IS_SYMLINK to: @0@'.format(varrunissymllink))
+conf.set10('VARRUN_IS_SYMLINK', varrunissymllink)
+#endif // 1
+
 pamlibdir = get_option('pamlibdir')
 if pamlibdir == ''
         pamlibdir = join_paths(rootlibdir, 'security')
@@ -491,8 +497,8 @@ decl_headers = '''
 #include <uchar.h>
 #include <linux/ethtool.h>
 #include <linux/fib_rules.h>
-//#include <linux/stat.h>
-//#include <sys/stat.h>
+#include <linux/stat.h>
+#include <sys/stat.h>
 '''
 # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail
 
@@ -888,7 +894,7 @@ enable_debug_mmap_cache = false
 #if 1 /// additional elogind debug mode
 enable_debug_elogind = false
 #endif // 1
-foreach name : get_option('debug')
+foreach name : get_option('debug-extra')
         if name == 'hashmap'
                 enable_debug_hashmap = true
         elif name == 'mmap-cache'
@@ -3183,28 +3189,31 @@ status = [
 
         'split /usr:                        @0@'.format(split_usr),
         'split bin-sbin:                    @0@'.format(split_bin),
-#if 0 /// UNSUPPORTED by elogind
-#         'prefix directory:                  @0@'.format(prefixdir),
-#         'rootprefix directory:              @0@'.format(rootprefixdir),
-#         'sysconf directory:                 @0@'.format(sysconfdir),
-#         'include directory:                 @0@'.format(includedir),
-#         'lib directory:                     @0@'.format(libdir),
-#         'rootlib directory:                 @0@'.format(rootlibdir),
-#         'SysV init scripts:                 @0@'.format(sysvinit_path),
-#         'SysV rc?.d directories:            @0@'.format(sysvrcnd_path),
-#else
+        'prefix directory:                  @0@'.format(prefixdir),
+        'rootprefix directory:              @0@'.format(rootprefixdir),
+        'sysconf directory:                 @0@'.format(sysconfdir),
+        'include directory:                 @0@'.format(includedir),
+        'lib directory:                     @0@'.format(libdir),
+        'rootlib directory:                 @0@'.format(rootlibdir),
+#if 1 /// Needed by elogind
         'rootexeclib dir:                   @0@'.format(rootlibexecdir),
+#endif // 1
+#if 0 /// UNNEEDED by elogind
+#        'SysV init scripts:                 @0@'.format(sysvinit_path),
+#        'SysV rc?.d directories:            @0@'.format(sysvrcnd_path),
 #endif // 0
+        'PAM modules directory:             @0@'.format(pamlibdir),
+        'PAM configuration directory:       @0@'.format(pamconfdir),
+#if 0 /// UNNEEDED by elogind
+#        'RPM macros directory:              @0@'.format(rpmmacrosdir),
+#endif // 0
+        'modprobe.d directory:              @0@'.format(modprobedir),
+        'D-Bus policy directory:            @0@'.format(dbuspolicydir),
+        'D-Bus session directory:           @0@'.format(dbussessionservicedir),
+        'D-Bus system directory:            @0@'.format(dbussystemservicedir),
+        'bash completions directory:        @0@'.format(bashcompletiondir),
+        'zsh completions directory:         @0@'.format(zshcompletiondir),
 #if 0 /// UNSUPPORTED by elogind
-#         'PAM modules directory:             @0@'.format(pamlibdir),
-#         'PAM configuration directory:       @0@'.format(pamconfdir),
-#         'RPM macros directory:              @0@'.format(rpmmacrosdir),
-#         'modprobe.d directory:              @0@'.format(modprobedir),
-#         'D-Bus policy directory:            @0@'.format(dbuspolicydir),
-#         'D-Bus session directory:           @0@'.format(dbussessionservicedir),
-#         'D-Bus system directory:            @0@'.format(dbussystemservicedir),
-#         'bash completions directory:        @0@'.format(bashcompletiondir),
-#         'zsh completions directory:         @0@'.format(zshcompletiondir),
 #         'extra start script:                @0@'.format(get_option('rc-local')),
 #         'extra stop script:                 @0@'.format(get_option('halt-local')),
 #         'debug shell:                       @0@ @ @1@'.format(get_option('debug-shell'),
@@ -3225,8 +3234,10 @@ status = [
 #         'render group access mode:          @0@'.format(get_option('group-render-mode')),
 #         'certificate root directory:        @0@'.format(get_option('certificate-root')),
 #         'support URL:                       @0@'.format(support_url),
-#         'nobody user name:                  @0@'.format(nobody_user),
-#         'nobody group name:                 @0@'.format(nobody_group),
+#endif // 0
+        'nobody user name:                  @0@'.format(nobody_user),
+        'nobody group name:                 @0@'.format(nobody_group),
+#if 0 /// UNSUPPORTED by elogind
 #         'fallback hostname:                 @0@'.format(get_option('fallback-hostname')),
 #         'symbolic gateway hostnames:        @0@'.format(', '.join(gateway_hostnames)),
 #