Description: Update upstream meson config
 Add some structure to the configuration file and add additional information
 in the build summary
Author: Nick Morrott <nickm@debian.org>
Forwarded: not-needed
Last-Update: 2022-02-11
---
--- a/meson.build
+++ b/meson.build
@@ -1,74 +1,135 @@
-project('connman-gtk', 'c',
-	version : '1.1.1',
-	license: [
-        'GPL-2.0',
-         ],
-         default_options: [
-        'c_std=c11',
-        ])
-
+project(
+  'connman-gtk', 'c',
+  version: '1.1.1',
+  license: 'GPL2',
+  default_options: 'c_std=c11',
+)
+
+connman_gtk_name = meson.project_name()
+
+connman_gtk_version = meson.project_version()
+connman_gtk_version_array = connman_gtk_version.split('.')
+connman_gtk_major_version = connman_gtk_version_array[0].to_int()
+connman_gtk_minor_version = connman_gtk_version_array[1].to_int()
+connman_gtk_patch_version = connman_gtk_version_array[2].to_int()
+
+connman_gtk_prefix = get_option('prefix')
+connman_gtk_bindir = get_option('bindir')
+connman_gtk_datadir = get_option('datadir')
+connman_gtk_includedir = get_option('includedir')
+connman_gtk_localedir = get_option('localedir')
+connman_gtk_mandir = get_option('mandir')
+
+#*******************************************************************************
+# Compiler flags
+#*******************************************************************************
 
 am_cflags = [
-    '-fstack-protector',
-    '-pedantic',
-    '-Wstrict-prototypes',
-    '-Wundef',
-    '-Werror-implicit-function-declaration',
-    '-Wformat',
-    '-Wformat-security',
-    '-Werror=format-security',
-    '-Wconversion',
-    '-Wno-unused-parameter',
-    '-Wunreachable-code',
-    '-Wall',
-    '-W',
+  '-fstack-protector',
+  '-pedantic',
+  '-Wstrict-prototypes',
+  '-Wundef',
+  '-Werror-implicit-function-declaration',
+  '-Wformat',
+  '-Wformat-security',
+  '-Werror=format-security',
+  '-Wconversion',
+  '-Wno-unused-parameter',
+  '-Wunreachable-code',
+  '-Wall',
+  '-W',
 ]
 add_global_arguments(am_cflags, language: 'c')
 
+#*******************************************************************************
+# Dependencies
+#*******************************************************************************
+
 gtk = dependency('gtk+-3.0', version: '>=3.22')
 glib = dependency('glib-2.0', version: '>=2.50')
 
+#*******************************************************************************
+# i18n
+#*******************************************************************************
+
 i18n = import('i18n')
 
+source_root = meson.current_source_dir()
+po_dir = source_root / 'po'
+
+#*******************************************************************************
+# Configuration Data
+#*******************************************************************************
+
 conf_data = configuration_data()
+
 openconnect = disabler()
 cc = meson.get_compiler('c')
 dl = cc.find_library('dl', required: false)
 
 use_openconnect = get_option('use_openconnect')
 if(use_openconnect == 'yes')
-	openconnect = dependency('openconnect', version: '>=5.99')
+  openconnect = dependency('openconnect', version: '>=5.99')
 endif
 if(use_openconnect == 'dynamic' and dl.found())
-	openconnect = dependency('openconnect', version: '>=5.99')
-	conf_data.set('USE_OPENCONNECT_DYNAMIC', true)
+  openconnect = dependency('openconnect', version: '>=5.99')
+  conf_data.set('USE_OPENCONNECT_DYNAMIC', true)
 endif
 if (use_openconnect == 'check')
-	openconnect = dependency('openconnect', version: '>=5.99', required : false)
+  openconnect = dependency('openconnect', version: '>=5.99', required : false)
 endif
 
 conf_data.set('USE_OPENCONNECT', openconnect.found())
 conf_data.set('USE_STATUS_ICON', get_option('use_status_icon'))
-conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-conf_data.set_quoted('CONNMAN_GTK_LOCALEDIR', get_option('prefix') + '/' + get_option('localedir') + '/')
 
-conf_data.set('version', meson.project_version())
-configure_file(input : 'config.h.in',
-               output : 'config.h',
-               configuration : conf_data)
+conf_data.set_quoted('GETTEXT_PACKAGE', connman_gtk_name)
+conf_data.set_quoted('CONNMAN_GTK_LOCALEDIR', connman_gtk_prefix + '/' + connman_gtk_localedir + '/')
+
+conf_data.set('version', connman_gtk_version)
+configure_file(
+  input: 'config.h.in',
+  output: 'config.h',
+  configuration: conf_data
+)
 
 extra_includes = [
-    include_directories('.'),
+  include_directories('.'),
 ]
 
 readmes = [
-    'CHANGELOG.md',
-    'README.md'
+  'CHANGELOG.md',
+  'README.md'
 ]
 
-
 # install_data(readmes, install_dir : join_paths(get_option('datadir'), meson.project_name(), 'doc'))
-subdir('po')
-subdir('src')
+
+#*******************************************************************************
+# Source directories
+#*******************************************************************************
+
 subdir('data')
+subdir('src')
+subdir('po')
 
+#*******************************************************************************
+# Summary
+#*******************************************************************************
+
+summary(
+  {
+    'Building connman_gtk with prefix': connman_gtk_prefix,
+  }, section: 'Directories'
+)
+
+summary(
+  {
+    'openconnect' : get_option('use_openconnect'),
+    'status icon' : get_option('use_status_icon'),
+  }, section: 'Optional features'
+)
+
+summary(
+  {
+    'openconnect' : openconnect.found(),
+  }, section: 'Optional dependencies'
+)
