Organize configuration summary

2 files changed, 36 insertions, 16 deletions

diff --git a/doc/meson.build b/doc/meson.build
index 01e6bdc..f194e4c 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -35,5 +35,5 @@ if not get_option('docs').disabled()
 endif
 
 if not meson.is_subproject()
-  summary('API Documentation', build_docs, bool_yn: true)
+  summary('API Documentation', build_docs, bool_yn: true, section: 'Components')
 endif
diff --git a/meson.build b/meson.build
index 8894be4..bc81107 100644
--- a/meson.build
+++ b/meson.build
@@ -148,25 +148,45 @@ if not get_option('tools').disabled()
   endif
 endif
 
-if not get_option('docs').disabled()
-  subdir('doc')
+# Display top-level summary (before subdirectories to appear first)
+if not meson.is_subproject()
+  summary(
+    {
+      'Tests': not get_option('tests').disabled(),
+      'Tools': not get_option('tools').disabled(),
+    },
+    bool_yn: true,
+    section: 'Components',
+  )
+
+  summary(
+    {
+      'Install prefix':  get_option('prefix'),
+      'Headers':  get_option('prefix') / get_option('includedir'),
+      'Libraries':  get_option('prefix') / get_option('libdir'),
+    },
+    section: 'Directories',
+  )
+
+  if not get_option('tools').disabled()
+    summary(
+      {
+        'Executables': get_option('prefix') / get_option('bindir'),
+        'Man pages': get_option('prefix') / get_option('mandir'),
+      },
+      section: 'Directories',
+    )
+  endif
 endif
 
+###########
+# Support #
+###########
+
 if not get_option('tests').disabled()
   subdir('test')
 endif
 
-if not meson.is_subproject()
-  summary('Tests', not get_option('tests').disabled(), bool_yn: true)
-  summary('Utilities', not get_option('tools').disabled(), bool_yn: true)
-
-  summary('Install prefix', get_option('prefix'))
-
-  summary('Headers', get_option('prefix') / get_option('includedir'))
-  summary('Libraries', get_option('prefix') / get_option('libdir'))
-
-  if not get_option('tools').disabled()
-    summary('Executables', get_option('prefix') / get_option('bindir'))
-    summary('Man pages', get_option('prefix') / get_option('mandir'))
-  endif
+if not get_option('docs').disabled()
+  subdir('doc')
 endif