From c716c2537ff6d11d60a3ceee0752ff8b9f647ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 15 Apr 2021 09:56:06 +0200 Subject: [PATCH] meson: fold static libsystemd and libudev into the generic status line It's a very specialized feature and we don't need to devote a separate line to it. --- meson.build | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 69d4854e32a..da0e71fe1f1 100644 --- a/meson.build +++ b/meson.build @@ -3724,10 +3724,6 @@ alt_time_epoch = run_command('date', '-Is', '-u', '-d', status += [ 'time epoch: @0@ (@1@)'.format(time_epoch, alt_time_epoch)] -status += [ - 'static libsystemd: @0@'.format(static_libsystemd), - 'static libudev: @0@'.format(static_libudev)] - # TODO: # CFLAGS: ${OUR_CFLAGS} ${CFLAGS} # CPPFLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS} @@ -3869,6 +3865,18 @@ foreach tuple : [ endif endforeach +if static_libsystemd == 'false' + missing += 'static-libsystemd' +else + found += 'static-libsystemd(@0@)'.format(static_libsystemd) +endif + +if static_libudev == 'false' + missing += 'static-libudev' +else + found += 'static-libudev(@0@)'.format(static_libudev) +endif + status += [ '', 'enabled features: @0@'.format(', '.join(found)),