From 9798deaf46fcdd36dd5cdea141c6d6a668d2bc72 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 27 Apr 2022 20:47:38 +0900 Subject: [PATCH 1/2] meson: show default compression method in summary --- meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index ee3fc62d46..783630c1d1 100644 --- a/meson.build +++ b/meson.build @@ -4127,6 +4127,7 @@ summary({ 'nobody user name' : nobody_user, 'nobody group name' : nobody_group, 'fallback hostname' : get_option('fallback-hostname'), + 'default compression method' : compression, 'default DNSSEC mode' : default_dnssec, 'default DNS-over-TLS mode' : default_dns_over_tls, 'default mDNS mode' : default_mdns, From 1788c6f3c001826ca93cbee5664ef9ca9a22b1c8 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 27 Apr 2022 20:49:17 +0900 Subject: [PATCH 2/2] meson: also use COMPRESSION_NONE for default compression --- meson.build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 783630c1d1..fc98350d31 100644 --- a/meson.build +++ b/meson.build @@ -1470,9 +1470,7 @@ elif compression == 'lz4' and not have_lz4 elif compression == 'xz' and not have_xz error('default-compression=xz requires xz') endif -conf.set('DEFAULT_COMPRESSION', - compression == 'none' ? 0 : - 'COMPRESSION_@0@'.format(compression.to_upper())) +conf.set('DEFAULT_COMPRESSION', 'COMPRESSION_@0@'.format(compression.to_upper())) want_xkbcommon = get_option('xkbcommon') if want_xkbcommon != 'false' and not skip_deps