Meson: Cleanup GeoIP module

diff --git a/meson/geoip/meson.build b/meson/geoip/meson.build
index 0822650b5e5df5f207847e8068ecffaa37c9cd1e..43194f4561f1da2c9d2915734d859fc0d306fa1f 100644 (file)
--- a/meson/geoip/meson.build
+++ b/meson/geoip/meson.build
@@ -1,11 +1,26 @@
-# GeoIP
-# Outputs: deps_geoip
+dep_geoip = dependency('geoip', required: true)
+dep_libmmdb = dependency('libmaxminddb', required: true)
+dep_yaml_cpp = dependency('yaml-cpp', version: '>= 0.5', required: true)
 
-deps_geoip  = []
-deps_geoip += dependency('geoip', required: true)
-deps_geoip += dependency('libmaxminddb', required: true)
-deps_geoip += dependency('yaml-cpp', version: '>= 0.5', required: true)
+conf.set('HAVE_GEOIP', dep_geoip.found(), description: 'GeoIP')
+conf.set('HAVE_MMDB', dep_mmdb.found(), description: 'MaxMindDB')
 
-conf.set10('HAVE_GEOIP', deps_geoip[0].found(), description: 'Whether we have GeoIP')
-conf.set10('HAVE_MMDB', deps_geoip[1].found(), description: 'Whether we have MaxMindDB')
-summary('GeoIP', deps_geoip[0].found(), bool_yn: true, section: 'Configuration')
+summary('GeoIP', dep_geoip.found(), bool_yn: true, section: 'GeoIP')
+summary('GeoIP Name', dep_geoip.name(), section: 'GeoIP')
+summary('GeoIP Version', dep_geoip.version(), section: 'GeoIP')
+
+summary('MaxMindDB', dep_mmdb.found(), bool_yn: true, section: 'GeoIP')
+summary('MaxMindDB Name', dep_mmdb.name(), section: 'GeoIP')
+summary('MaxMindDB Version', dep_mmdb.version(), section: 'GeoIP')
+
+summary('YAML-CPP', dep_yaml_cpp.found(), bool_yn: true, section: 'GeoIP')
+summary('YAML-CPP Name', dep_yaml_cpp.name(), section: 'GeoIP')
+summary('YAML-CPP Version', dep_yaml_cpp.version(), section: 'GeoIP')
+
+dep_geoip = declare_dependency(
+  dependencies: [
+    dep_geoip,
+    dep_mmdb,
+    dep_yaml_cpp,
+  ],
+)