From: Fred Morcos Date: Fri, 8 Sep 2023 07:32:50 +0000 (+0200) Subject: Meson: Split the geoip, mmdb and yaml-cpp modules X-Git-Tag: rec-5.1.0-alpha1~80^2~113 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00072ca0b5acd12b045419ff8b3adf5a27046e4e;p=thirdparty%2Fpdns.git Meson: Split the geoip, mmdb and yaml-cpp modules --- diff --git a/meson-archive/geoip/meson.build b/meson-archive/geoip/meson.build deleted file mode 100644 index 2aca453828..0000000000 --- a/meson-archive/geoip/meson.build +++ /dev/null @@ -1,26 +0,0 @@ -dep_geoip = dependency('geoip', required: true) -dep_mmdb = dependency('libmaxminddb', required: true) -dep_yaml_cpp = 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') - -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, - ], -) diff --git a/meson.build b/meson.build index d658537763..12eaeb24e9 100644 --- a/meson.build +++ b/meson.build @@ -128,7 +128,7 @@ all_modules = { 'lua2': {'deps': [], 'exts': []}, 'remote': {'deps': ['prog-curl', 'zeromq'], 'exts': []}, 'tinydns': {'deps': ['cdb'], 'exts': []}, - 'geoip': {'deps': [], 'exts': []}, + 'geoip': {'deps': ['geoip', 'mmdb', 'yaml-cpp'], 'exts': []}, 'lmdb': {'deps': ['lmdb', 'boost-serialization'], 'exts': ['lmdb-safe']}, } diff --git a/meson/geoip/meson.build b/meson/geoip/meson.build new file mode 100644 index 0000000000..bcbeb2cf1a --- /dev/null +++ b/meson/geoip/meson.build @@ -0,0 +1,9 @@ +dep_geoip = dependency('geoip', required: false) + +conf.set('HAVE_GEOIP', dep_geoip.found(), description: 'GeoIP') + +summary('GeoIP', dep_geoip.found(), bool_yn: true, section: 'GeoIP Backend') +if dep_geoip.found() + summary('GeoIP Name', dep_geoip.name(), section: 'GeoIP Backend') + summary('GeoIP Version', dep_geoip.version(), section: 'GeoIP Backend') +endif diff --git a/meson/mmdb/meson.build b/meson/mmdb/meson.build new file mode 100644 index 0000000000..3873b27388 --- /dev/null +++ b/meson/mmdb/meson.build @@ -0,0 +1,9 @@ +dep_mmdb = dependency('libmaxminddb', required: false) + +conf.set('HAVE_MMDB', dep_mmdb.found(), description: 'MaxMindDB') + +summary('MaxMindDB', dep_mmdb.found(), bool_yn: true, section: 'GeoIP Backend') +if dep_mmdb.found() + summary('MaxMindDB Name', dep_mmdb.name(), section: 'GeoIP Backend') + summary('MaxMindDB Version', dep_mmdb.version(), section: 'GeoIP Backend') +endif diff --git a/meson/yaml-cpp/meson.build b/meson/yaml-cpp/meson.build new file mode 100644 index 0000000000..76c5cfb3a8 --- /dev/null +++ b/meson/yaml-cpp/meson.build @@ -0,0 +1,7 @@ +dep_yaml_cpp = dependency('yaml-cpp', version: '>= 0.5', required: true) + +summary('YAML-CPP', dep_yaml_cpp.found(), bool_yn: true, section: 'GeoIP Backend') +if dep_yaml_cpp.found() + summary('YAML-CPP Name', dep_yaml_cpp.name(), section: 'GeoIP Backend') + summary('YAML-CPP Version', dep_yaml_cpp.version(), section: 'GeoIP Backend') +endif diff --git a/modules/geoipbackend/meson.build b/modules/geoipbackend/meson.build index 8ff436d88a..6b35cb26cb 100644 --- a/modules/geoipbackend/meson.build +++ b/modules/geoipbackend/meson.build @@ -1,38 +1,3 @@ -# Detect mmap -have_mmap = cxx.has_function('mmap') -mman_h = cxx.has_header('sys/mman.h', required: false) -if not have_mmap - have_mmap = mman_h and cxx.has_function('mmap', prefix: '''#include ''') -endif -conf.set('HAVE_MMAP', have_mmap, description: 'GeoIP Backend: mmap') -summary('Have ', mman_h, bool_yn: true, section: 'GeoIP Backend') -summary('mmap', have_mmap, bool_yn: true, section: 'GeoIP Backend') - -# Detect GeoIP -dep_geoip = dependency('geoip', required: false) -conf.set('HAVE_GEOIP', dep_geoip.found(), description: 'GeoIP Backend: GeoIP Library') -summary('GeoIP', dep_geoip.found(), bool_yn: true, section: 'GeoIP Backend') -if dep_geoip.found() - summary('GeoIP Name', dep_geoip.name(), section: 'GeoIP Backend') - summary('GeoIP Version', dep_geoip.version(), section: 'GeoIP Backend') -endif - -# Detect MaxMindDB -dep_mmdb = dependency('libmaxminddb', required: false) -conf.set('HAVE_MMDB', dep_mmdb.found(), description: 'GeoIP Backend: MaxMindDB Library') -summary('MaxMindDB', dep_mmdb.found(), bool_yn: true, section: 'GeoIP Backend') -if dep_mmdb.found() - summary('MaxMindDB Name', dep_mmdb.name(), section: 'GeoIP Backend') - summary('MaxMindDB Version', dep_mmdb.version(), section: 'GeoIP Backend') -endif - -# Detect YAML-cpp -dep_yaml_cpp = dependency('yaml-cpp', version: '>= 0.5', required: true) -summary('YAML-CPP', dep_yaml_cpp.found(), bool_yn: true, section: 'GeoIP Backend') -summary('YAML-CPP Name', dep_yaml_cpp.name(), section: 'GeoIP Backend') -summary('YAML-CPP Version', dep_yaml_cpp.version(), section: 'GeoIP Backend') - -# Build the backend sources = [ 'geoipbackend.cc', 'geoipinterface-dat.cc',