diff --git a/meson.build b/meson.build index 751ad3ded9b..86d2025048e 100644 --- a/meson.build +++ b/meson.build @@ -844,8 +844,7 @@ if not libcap.found() endif libmount = dependency('mount', - version : '>= 2.30', - required : not fuzzer_build) + version : fuzzer_build ? '>= 0' : '>= 2.30') want_seccomp = get_option('seccomp') if want_seccomp != 'false' and not fuzzer_build @@ -2904,8 +2903,9 @@ foreach tuple : [ ['debug mmap cache'], ] - cond = tuple.get(1, '') - if cond == '' + if tuple.length() >= 2 + cond = tuple[1] + else ident1 = 'HAVE_' + tuple[0].underscorify().to_upper() ident2 = 'ENABLE_' + tuple[0].underscorify().to_upper() cond = conf.get(ident1, 0) == 1 or conf.get(ident2, 0) == 1 diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build index 5fdc4cccd7b..cbe2be19c78 100644 --- a/src/journal-remote/meson.build +++ b/src/journal-remote/meson.build @@ -61,6 +61,6 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 meson.add_install_script('sh', '-c', mkdir_p.format('/var/log/journal/remote')) meson.add_install_script('sh', '-c', - 'chown 0:0 $DESTDIR/var/log/journal/remote && - chmod 755 $DESTDIR/var/log/journal/remote || :') + '''chown 0:0 $DESTDIR/var/log/journal/remote && + chmod 755 $DESTDIR/var/log/journal/remote || :''') endif