Clean up and organize configuration summary

2 files changed, 40 insertions, 22 deletions

diff --git a/doc/meson.build b/doc/meson.build
index 7bc4c0f4..b492483d 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -23,10 +23,6 @@ endif
 
 # Build documentation if all required tools are found
 build_docs = doxygen.found() and sphinxygen.found() and sphinx_build.found()
-if not meson.is_subproject()
-  summary('Documentation', build_docs, bool_yn: true, section: 'Configuration')
-endif
-
 if build_docs
   # Warn if the "official" theme isn't present
   pymod = import('python')
@@ -74,7 +70,6 @@ endif
 # Man Pages #
 #############
 
-mandoc = find_program('mandoc', required: false)
 mandoc_css = files('mandoc.css')
 
 if get_option('lint')
@@ -84,6 +79,7 @@ if get_option('lint')
   endif
 endif
 
+mandoc = find_program('mandoc', required: false)
 if mandoc.found()
   configure_file(input: mandoc_css, output: '@PLAINNAME@', copy: true)
 
@@ -105,6 +101,12 @@ if mandoc.found()
 endif
 
 if not meson.is_subproject()
-  summary('HTML man pages', build_docs, bool_yn: true)
-  summary('Reference documentation', build_docs, bool_yn: true)
+  summary(
+    {
+      'HTML man pages': mandoc.found(),
+      'API documentation': build_docs,
+    },
+    bool_yn: true,
+    section: 'Components',
+  )
 endif
diff --git a/meson.build b/meson.build
index 0c9c2847..44fc3328 100644
--- a/meson.build
+++ b/meson.build
@@ -190,6 +190,37 @@ if not get_option('tools').disabled()
   endif
 endif
 
+# 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 #
 ###########
@@ -217,18 +248,3 @@ endif
 if not get_option('docs').disabled()
   subdir('doc')
 endif
-
-if not meson.is_subproject()
-  summary('Tests', not get_option('tests').disabled(), bool_yn: true)
-  summary('Tools', 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
-endif