From a0de6ee36e8fa4b982646887a945ca6745960da0 Mon Sep 17 00:00:00 2001
From: Daniel Markstedt <daniel@mindani.net>
Date: Sat, 27 Jul 2024 09:11:46 +0900
Subject: [PATCH] meson: Rearrange the setup summary for brevity and clarity

---
 meson.build | 44 +++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/meson.build b/meson.build
index 925ecc2d2b..baa774a4f5 100644
--- a/meson.build
+++ b/meson.build
@@ -1723,7 +1723,7 @@ else
     have_shadow = (cc.has_header('shadow.h'))
     if have_shadow
         cdata.set('SHADOWPW', 1)
-        uams_options += 'SHADOW'
+        uams_options += 'shadow'
     else
         have_shadow = false
         warning('Shadow password support requested but required header not found')
@@ -2176,32 +2176,21 @@ summary_info = {
     'host CPU': cpu,
     'host endianness': build_machine.endian(),
     'C compiler': cc.get_id(),
+    'Shared or static libraries': get_option('default_library'),
 }
 summary(summary_info, bool_yn: true, section: 'Compilation:')
 
 # Configuration summary
 
 summary({'Netatalk version': netatalk_version}, section: 'Configuration Summary:')
-summary_info = {
-    '  Initscript style': init_style,
-}
-summary(summary_info, bool_yn: true, section: '  Init Style:')
-
-summary_info = {
-    '  Extended Attributes': netatalk_ea,
-    '  Spotlight support': have_spotlight,
-}
-summary(summary_info, bool_yn: true, section: '  AFP:')
-
-summary_info = {
-    '  Backends': summary_backends,
-}
-summary(summary_info, bool_yn: true, section: '  CNID:')
 
 summary_info = {
     '  Access control': uams_options,
+    '  CNID backends': summary_backends,
+    '  Extended Attributes': netatalk_ea,
+    '  Init script style': init_style,
 }
-summary(summary_info, bool_yn: true, section: '  Authentication:')
+summary(summary_info, bool_yn: true, section: '  Options:')
 
 summary_info = {
     '  ClearTxt': true,
@@ -2212,17 +2201,17 @@ summary_info = {
     '  PGP': have_pgp_uam,
     '  RandNum': have_ssl,
 }
-summary(summary_info, bool_yn: true, section: '  UAMs:')
+summary(summary_info, bool_yn: true, section: '  Authentication modules:')
 
 summary_info = {
-    '  ACL support': have_acls,
+    '  ACL': have_acls,
     '  AFP stats via dbus': have_afpstats,
-    '  Cracklib support': have_cracklib,
+    '  Cracklib': have_cracklib,
     '  dtrace probes': have_dtrace,
-    '  GSSAPI support': have_gssapi,
-    '  Kerberos support': have_kerberos,
-    '  LDAP support': have_ldap,
-    '  Quota support': have_quota,
+    '  GSSAPI': have_gssapi,
+    '  Kerberos': have_kerberos,
+    '  LDAP': have_ldap,
+    '  Quota': have_quota,
 }
 if have_quota
     summary_info += {
@@ -2230,16 +2219,17 @@ if have_quota
     }
 endif
 summary_info += {
+    '  Spotlight': have_spotlight,
     '  SSL provider': ssl_provider,
-    '  TCP wrapper support': have_tcpwrap,
-    '  Zeroconf support': have_zeroconf,
+    '  TCP wrapper': have_tcpwrap,
+    '  Zeroconf': have_zeroconf,
 }
 if enable_zeroconf
     summary_info += {
         '  Zeroconf provider': zeroconf_provider,
     }
 endif
-summary(summary_info, bool_yn: true, section: '  Options:')
+summary(summary_info, bool_yn: true, section: '  Features:')
 
 summary_info = {
     '  dbus daemon path': dbus_daemonpath,