[#3729] Updated meson.build files

diff --git a/meson.build b/meson.build
index 9fc51f219329b932c3ecc4a68b1b79c33bfecd1c..c6b4a174e85a923cb8184bbd014bc154cedaad16 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -19,6 +19,10 @@ TOP_SOURCE_DIR = meson.current_source_dir()
 KEA_ADMIN = f'@TOP_BUILD_DIR@/src/bin/admin/kea-admin'
 KEA_LFC = f'@TOP_BUILD_DIR@/src/bin/lfc/kea-lfc'
 TEST_CA_DIR = f'@TOP_SOURCE_DIR@/src/lib/asiolink/testutils/ca'
+DATABASE_SCRIPTS_DIR = f'@TOP_BUILD_DIR@/src/share/database/scripts'
+RUN_STATE_DIR = get_option('localstatedir')
+PREFIX = get_option('prefix')
+DHCP_DATA_DIR = f'@PREFIX@/@RUN_STATE_DIR@/run/kea'
 
 # TODO: Control it via a build option.
 FUZZING_IN_CI = false
@@ -290,7 +294,6 @@ message(f'Detected system "@SYSTEM@".')
 
 #### System-specific Compiler Flags
 
-PREFIX = get_option('prefix')
 if SYSTEM == 'darwin'
     add_project_arguments('-D__APPLE_USE_RFC_3542', language: 'cpp')
     add_project_link_arguments(f'-Wl,-rpath,@PREFIX@/lib', language: 'cpp')

diff --git a/src/lib/asiodns/tests/meson.build b/src/lib/asiodns/tests/meson.build
index 8f088f58210d019c8d1b74d6c96c677b04eb9774..d0e99f9be78d2d912d5ed0fd883db27e7434b7e1 100644 (file)
--- a/src/lib/asiodns/tests/meson.build
+++ b/src/lib/asiodns/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_asiodns_tests = executable(
     'kea-asiodns-tests',
     'io_fetch_unittest.cc',

diff --git a/src/lib/asiolink/meson.build b/src/lib/asiolink/meson.build
index fcbb94117c0683939d53af1460a68caff19858f0..decfb60ae915fe565694e97130699091c1a0d08c 100644 (file)
--- a/src/lib/asiolink/meson.build
+++ b/src/lib/asiolink/meson.build
@@ -25,8 +25,8 @@ subdir('testutils')
 subdir('tests')
 kea_asiolink_headers = [
     'addr_utilities.h',
-    'asiolink.h',
     'asio_wrapper.h',
+    'asiolink.h',
     'botan_tls.h',
     'botan_wrapper.h',
     'common_tls.h',
@@ -52,9 +52,9 @@ kea_asiolink_headers = [
     'tls_socket.h',
     'udp_endpoint.h',
     'udp_socket.h',
+    'unix_domain_socket.h',
     'unix_domain_socket_acceptor.h',
     'unix_domain_socket_endpoint.h',
-    'unix_domain_socket.h',
 ]
 install_headers(
     kea_asiolink_headers,

diff --git a/src/lib/asiolink/tests/meson.build b/src/lib/asiolink/tests/meson.build
index d84f512aeefbccd52ad82c4045fe255824b01570..04f03b45f8439422ed639cfd9513768c4853c2d1 100644 (file)
--- a/src/lib/asiolink/tests/meson.build
+++ b/src/lib/asiolink/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 CURRENT_BUILD_DIR = meson.current_build_dir()
 configure_file(
     input: 'process_spawn_app.sh.in',

diff --git a/src/lib/asiolink/testutils/meson.build b/src/lib/asiolink/testutils/meson.build
index fafe6b9c7d4dc7e85fa2938405c2a3a04bf7966a..3cbf1860e73c146efe2339c8296859bacff9e5ad 100644 (file)
--- a/src/lib/asiolink/testutils/meson.build
+++ b/src/lib/asiolink/testutils/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_asiolink_testutils_lib = static_library(
     'kea-asiolink-testutils',
     'test_tls.cc',

diff --git a/src/lib/cc/tests/meson.build b/src/lib/cc/tests/meson.build
index f271113ecf6208bf6d6474ce379d8fec9559c191..f51220514b6bead2869b391ba954996a6657acae 100644 (file)
--- a/src/lib/cc/tests/meson.build
+++ b/src/lib/cc/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_cc_tests = executable(
     'kea-cc-tests',
     'command_interpreter_unittests.cc',

diff --git a/src/lib/config/meson.build b/src/lib/config/meson.build
index b4130268f53f618ba93188a4d2bc6b557d310666..5387ee25a52e38e3b975fb8d293a61ca047942b6 100644 (file)
--- a/src/lib/config/meson.build
+++ b/src/lib/config/meson.build
@@ -24,8 +24,8 @@ kea_config_headers = [
     'base_command_mgr.h',
     'client_connection.h',
     'cmd_http_listener.h',
-    'cmd_response_creator_factory.h',
     'cmd_response_creator.h',
+    'cmd_response_creator_factory.h',
     'cmds_impl.h',
     'command_mgr.h',
     'config_log.h',
@@ -33,8 +33,8 @@ kea_config_headers = [
     'hooked_command_mgr.h',
     'http_command_config.h',
     'http_command_mgr.h',
-    'http_command_response_creator_factory.h',
     'http_command_response_creator.h',
+    'http_command_response_creator_factory.h',
     'timeouts.h',
     'unix_command_config.h',
     'unix_command_mgr.h',

diff --git a/src/lib/config_backend/tests/meson.build b/src/lib/config_backend/tests/meson.build
index 1c9f30849f61cc970a88833229379735d841a8ae..eda6565cf6528e31de5490ab048649d273353a26 100644 (file)
--- a/src/lib/config_backend/tests/meson.build
+++ b/src/lib/config_backend/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_config_backend_tests = executable(
     'kea-config_backend-tests',
     'config_backend_mgr_unittest.cc',

diff --git a/src/lib/cryptolink/tests/meson.build b/src/lib/cryptolink/tests/meson.build
index 0ec4e6604642e54eb97198fdf116d674e00c3a87..aec940ae4f3a9035ebf47619b5e1b8ea7a4e7719 100644 (file)
--- a/src/lib/cryptolink/tests/meson.build
+++ b/src/lib/cryptolink/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_cryptolink_tests = executable(
     'kea-cryptolink-tests',
     'crypto_unittests.cc',

diff --git a/src/lib/database/meson.build b/src/lib/database/meson.build
index 5b01dcbe2459b4a702b44683727bf627ca4cdd45..374ad068c36e681311de3217d3d4b1856dc39ffb 100644 (file)
--- a/src/lib/database/meson.build
+++ b/src/lib/database/meson.build
@@ -22,12 +22,12 @@ kea_database_headers = [
     'audit_entry.h',
     'backend_selector.h',
     'database_connection.h',
-    'dbaccess_parser.h',
     'db_exceptions.h',
     'db_log.h',
     'db_messages.h',
-    'server_collection.h',
+    'dbaccess_parser.h',
     'server.h',
+    'server_collection.h',
     'server_selector.h',
 ]
 install_headers(

diff --git a/src/lib/database/tests/meson.build b/src/lib/database/tests/meson.build
index 781e5254d49b5f0bd9f56a09027637734da7c8dc..742fbf67813d976dc1d110de1993f94d441dfdb9 100644 (file)
--- a/src/lib/database/tests/meson.build
+++ b/src/lib/database/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_database_tests = executable(
     'kea-database-tests',
     'audit_entry_unittest.cc',

diff --git a/src/lib/database/testutils/meson.build b/src/lib/database/testutils/meson.build
index 36fca23c40d99ce87c1c3070325514656f4d00c3..4f198804d52f7828af3f0f9d4febbba26f15ae18 100644 (file)
--- a/src/lib/database/testutils/meson.build
+++ b/src/lib/database/testutils/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_database_testutils_lib = static_library(
     'kea-database-testutils',
     'schema.cc',

diff --git a/src/lib/dhcp/meson.build b/src/lib/dhcp/meson.build
index 0206596c074a5c62baf5a2bcd2eec98cceba989f..e74be1a7aee8d6556d09e0c2ae03960590a6fb5e 100644 (file)
--- a/src/lib/dhcp/meson.build
+++ b/src/lib/dhcp/meson.build
@@ -66,13 +66,14 @@ kea_dhcp_headers = [
     'dhcp4.h',
     'dhcp6.h',
     'docsis3_option_defs.h',
-    'duid_factory.h',
     'duid.h',
+    'duid_factory.h',
     'hwaddr.h',
-    'iface_mgr_error_handler.h',
     'iface_mgr.h',
+    'iface_mgr_error_handler.h',
     'libdhcp++.h',
     'opaque_data_tuple.h',
+    'option.h',
     'option4_addrlst.h',
     'option4_client_fqdn.h',
     'option4_dnr.h',
@@ -80,8 +81,8 @@ kea_dhcp_headers = [
     'option6_auth.h',
     'option6_client_fqdn.h',
     'option6_dnr.h',
-    'option6_iaaddr.h',
     'option6_ia.h',
+    'option6_iaaddr.h',
     'option6_iaprefix.h',
     'option6_pdexclude.h',
     'option6_status_code.h',
@@ -89,30 +90,29 @@ kea_dhcp_headers = [
     'option_custom.h',
     'option_data_types.h',
     'option_definition.h',
-    'option.h',
-    'option_int_array.h',
     'option_int.h',
+    'option_int_array.h',
     'option_opaque_data_tuples.h',
-    'option_space_container.h',
     'option_space.h',
+    'option_space_container.h',
     'option_string.h',
-    'option_vendor_class.h',
     'option_vendor.h',
+    'option_vendor_class.h',
     'packet_queue.h',
+    'packet_queue_mgr.h',
     'packet_queue_mgr4.h',
     'packet_queue_mgr6.h',
-    'packet_queue_mgr.h',
     'packet_queue_ring.h',
+    'pkt.h',
     'pkt4.h',
     'pkt4o6.h',
     'pkt6.h',
+    'pkt_filter.h',
     'pkt_filter6.h',
     'pkt_filter_bpf.h',
-    'pkt_filter.h',
-    'pkt_filter_inet6.h',
     'pkt_filter_inet.h',
+    'pkt_filter_inet6.h',
     'pkt_filter_lpf.h',
-    'pkt.h',
     'pkt_template.h',
     'protocol_util.h',
     'socket_info.h',

diff --git a/src/lib/dhcp_ddns/tests/meson.build b/src/lib/dhcp_ddns/tests/meson.build
index 434156a8a41f6969a1ee51c05a2a5ec823788c3a..6a632243fceebdf03647f645d4a02386c205fe56 100644 (file)
--- a/src/lib/dhcp_ddns/tests/meson.build
+++ b/src/lib/dhcp_ddns/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_dhcp_ddns_tests = executable(
     'kea-dhcp_ddns-tests',
     'ncr_udp_unittests.cc',

diff --git a/src/lib/dhcpsrv/meson.build b/src/lib/dhcpsrv/meson.build
index 4208db59eb30fa9dac58484b99761d8792f61abb..96599c582d070b7196e3513b68c3d6974bde1fe6 100644 (file)
--- a/src/lib/dhcpsrv/meson.build
+++ b/src/lib/dhcpsrv/meson.build
@@ -86,7 +86,7 @@ kea_dhcpsrv_lib = library(
     'timer_mgr.cc',
     'tracking_lease_mgr.cc',
     cpp_args: [
-        f'-DDHCP_DATA_DIR="@TOP_BUILD_DIR@"',
+        f'-DDHCP_DATA_DIR="@DHCP_DATA_DIR@"',
         f'-DKEA_LFC_EXECUTABLE="@KEA_LFC@"',
     ],
     dependencies: [crypto],
@@ -97,17 +97,17 @@ kea_dhcpsrv_lib = library(
 )
 LIBS_BUILT_SO_FAR = [kea_dhcpsrv_lib] + LIBS_BUILT_SO_FAR
 kea_dhcpsrv_headers = [
-    'allocation_state.h',
-    'allocator.h',
     'alloc_engine.h',
     'alloc_engine_log.h',
     'alloc_engine_messages.h',
+    'allocation_state.h',
+    'allocator.h',
     'base_host_data_source.h',
     'cache_host_data_source.h',
     'callout_handle_store.h',
+    'cb_ctl_dhcp.h',
     'cb_ctl_dhcp4.h',
     'cb_ctl_dhcp6.h',
-    'cb_ctl_dhcp.h',
     'cfg_4o6.h',
     'cfg_consistency.h',
     'cfg_db_access.h',
@@ -119,14 +119,14 @@ kea_dhcpsrv_headers = [
     'cfg_hosts_util.h',
     'cfg_iface.h',
     'cfg_mac_source.h',
-    'cfgmgr.h',
     'cfg_multi_threading.h',
-    'cfg_option_def.h',
     'cfg_option.h',
+    'cfg_option_def.h',
     'cfg_rsoo.h',
     'cfg_shared_networks.h',
     'cfg_subnets4.h',
     'cfg_subnets6.h',
+    'cfgmgr.h',
     'client_class_def.h',
     'config_backend_dhcp4.h',
     'config_backend_dhcp4_mgr.h',
@@ -148,9 +148,9 @@ kea_dhcpsrv_headers = [
     'flq_allocator.h',
     'fuzz_log.h',
     'fuzz_messages.h',
+    'host.h',
     'host_container.h',
     'host_data_source_factory.h',
-    'host.h',
     'host_mgr.h',
     'hosts_log.h',
     'hosts_messages.h',
@@ -159,11 +159,11 @@ kea_dhcpsrv_headers = [
     'iterative_allocation_state.h',
     'iterative_allocator.h',
     'key_from_key.h',
+    'lease.h',
     'lease_file_loader.h',
     'lease_file_stats.h',
-    'lease.h',
-    'lease_mgr_factory.h',
     'lease_mgr.h',
+    'lease_mgr_factory.h',
     'memfile_lease_limits.h',
     'memfile_lease_mgr.h',
     'memfile_lease_storage.h',
@@ -177,14 +177,14 @@ kea_dhcpsrv_headers = [
     'parsers/dhcp_queue_control_parser.h',
     'parsers/duid_config_parser.h',
     'parsers/expiration_config_parser.h',
-    'parsers/host_reservations_list_parser.h',
     'parsers/host_reservation_parser.h',
+    'parsers/host_reservations_list_parser.h',
     'parsers/ifaces_config_parser.h',
     'parsers/multi_threading_config_parser.h',
     'parsers/option_data_parser.h',
     'parsers/sanity_checks_parser.h',
-    'parsers/shared_networks_list_parser.h',
     'parsers/shared_network_parser.h',
+    'parsers/shared_networks_list_parser.h',
     'parsers/simple_parser4.h',
     'parsers/simple_parser6.h',
     'pool.h',

diff --git a/src/lib/dns/meson.build b/src/lib/dns/meson.build
index 7395b1e436838438a77cf1edf2f45be26cc3a88b..94403310e9354a89ae1a079e15d4c50602be08c7 100644 (file)
--- a/src/lib/dns/meson.build
+++ b/src/lib/dns/meson.build
@@ -42,16 +42,16 @@ kea_dns_headers = [
     'master_lexer.h',
     'master_lexer_inputsource.h',
     'master_lexer_state.h',
-    'master_loader_callbacks.h',
     'master_loader.h',
+    'master_loader_callbacks.h',
     'message.h',
     'messagerenderer.h',
     'name.h',
     'opcode.h',
     'question.h',
     'rcode.h',
-    'rdataclass.h',
     'rdata.h',
+    'rdataclass.h',
     'rrclass.h',
     'rrparamregistry.h',
     'rrset.h',
@@ -59,8 +59,8 @@ kea_dns_headers = [
     'rrtype.h',
     'serial.h',
     'time_utils.h',
-    'tsigerror.h',
     'tsig.h',
+    'tsigerror.h',
     'tsigkey.h',
     'tsigrecord.h',
     'txt_like.h',

diff --git a/src/lib/dns/tests/meson.build b/src/lib/dns/tests/meson.build
index 64b80b714d353887dfd835ae3182541529e01ef7..455d0c0af729ae6a917b6cc5824975bdc6307486 100644 (file)
--- a/src/lib/dns/tests/meson.build
+++ b/src/lib/dns/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_dns_tests = executable(
     'kea-dns-tests',
     'dns_exceptions_unittest.cc',

diff --git a/src/lib/eval/meson.build b/src/lib/eval/meson.build
index 71d6bf864185d326a8bf381a570816f0c33b7cf9..a69b4912a16a896c4f39b4e5bc5959a5683e755e 100644 (file)
--- a/src/lib/eval/meson.build
+++ b/src/lib/eval/meson.build
@@ -18,8 +18,8 @@ LIBS_BUILT_SO_FAR = [kea_eval_lib] + LIBS_BUILT_SO_FAR
 subdir('tests')
 kea_eval_headers = [
     'dependency.h',
-    'eval_context_decl.h',
     'eval_context.h',
+    'eval_context_decl.h',
     'eval_log.h',
     'eval_messages.h',
     'evaluate.h',

diff --git a/src/lib/eval/tests/meson.build b/src/lib/eval/tests/meson.build
index 46aca6af704dfd1baef76fb3a0353c20e156ba7a..2ebabb121c06fb34949e69d0c0f68ac10c4ece81 100644 (file)
--- a/src/lib/eval/tests/meson.build
+++ b/src/lib/eval/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_eval_tests = executable(
     'kea-eval-tests',
     'boolean_unittest.cc',

diff --git a/src/lib/exceptions/tests/meson.build b/src/lib/exceptions/tests/meson.build
index 6bdcceb9070cf98adf06778d79193dfab5da9529..2349b2a29aa4a49fc4e229a49a378b8d0c99d1b2 100644 (file)
--- a/src/lib/exceptions/tests/meson.build
+++ b/src/lib/exceptions/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_exceptions_tests = executable(
     'kea-exceptions-tests',
     'exceptions_unittest.cc',

diff --git a/src/lib/hooks/meson.build b/src/lib/hooks/meson.build
index e613807aa035a2981f5968da6ab809f51504eb43..ff51d8dad942281627fe52bb33518b412b758811 100644 (file)
--- a/src/lib/hooks/meson.build
+++ b/src/lib/hooks/meson.build
@@ -22,19 +22,19 @@ kea_hooks_lib = library(
 )
 LIBS_BUILT_SO_FAR = [kea_hooks_lib] + LIBS_BUILT_SO_FAR
 kea_hooks_headers = [
-    'callout_handle_associate.h',
     'callout_handle.h',
+    'callout_handle_associate.h',
     'callout_manager.h',
-    'hooks_config.h',
     'hooks.h',
+    'hooks_config.h',
     'hooks_log.h',
     'hooks_manager.h',
     'hooks_messages.h',
     'hooks_parser.h',
     'libinfo.h',
     'library_handle.h',
-    'library_manager_collection.h',
     'library_manager.h',
+    'library_manager_collection.h',
     'parking_lots.h',
     'pointer_converter.h',
     'server_hooks.h',

diff --git a/src/lib/http/meson.build b/src/lib/http/meson.build
index 7df8fe538fb2eab04403f44f9183e3d11ae50944..b829068b18ad3640f41256bdd314fddd77dc52a9 100644 (file)
--- a/src/lib/http/meson.build
+++ b/src/lib/http/meson.build
@@ -36,8 +36,8 @@ kea_http_headers = [
     'auth_config.h',
     'auth_log.h',
     'auth_messages.h',
-    'basic_auth_config.h',
     'basic_auth.h',
+    'basic_auth_config.h',
     'cfg_http_header.h',
     'client.h',
     'connection.h',
@@ -55,13 +55,13 @@ kea_http_headers = [
     'listener_impl.h',
     'post_request.h',
     'post_request_json.h',
-    'request_context.h',
     'request.h',
+    'request_context.h',
     'request_parser.h',
+    'response.h',
     'response_context.h',
-    'response_creator_factory.h',
     'response_creator.h',
-    'response.h',
+    'response_creator_factory.h',
     'response_json.h',
     'response_parser.h',
     'url.h',

diff --git a/src/lib/log/interprocess/tests/meson.build b/src/lib/log/interprocess/tests/meson.build
index b4bee667cc2224bf52e3c204e89a2e51a3e8fde7..90731658291a4354d332242c73e5c4e7ad2fc9e9 100644 (file)
--- a/src/lib/log/interprocess/tests/meson.build
+++ b/src/lib/log/interprocess/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_log_interprocess_tests = executable(
     'kea-log-interprocess-tests',
     'interprocess_sync_file_unittest.cc',

diff --git a/src/lib/log/tests/meson.build b/src/lib/log/tests/meson.build
index 445c2e638ea7390bf05917e8c0f94557b21b5a72..433e3d717c724f1616ecc37f387e864aac6dc8fb 100644 (file)
--- a/src/lib/log/tests/meson.build
+++ b/src/lib/log/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_log_tests = executable(
     'kea-log-tests',
     'buffer_appender_unittest.cc',

diff --git a/src/lib/mysql/tests/meson.build b/src/lib/mysql/tests/meson.build
index 7efaac3ba9a4f1bf3f493efc81e6e53429646607..072ee040f1852762c06d9b504ead45c60bf40274 100644 (file)
--- a/src/lib/mysql/tests/meson.build
+++ b/src/lib/mysql/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 libs_testutils = [
     kea_mysql_testutils_lib,
     kea_database_testutils_lib,

diff --git a/src/lib/mysql/testutils/meson.build b/src/lib/mysql/testutils/meson.build
index 3edbda1747e754fa3324169d73bb80de3d00d3e9..3eddcb6f250f9932c6e268143e77b1e91bd30a05 100644 (file)
--- a/src/lib/mysql/testutils/meson.build
+++ b/src/lib/mysql/testutils/meson.build
@@ -1,4 +1,7 @@
-DATABASE_SCRIPTS_DIR = f'@TOP_BUILD_DIR@/src/share/database/scripts'
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_mysql_testutils_lib = static_library(
     'kea-mysql-testutils',
     'mysql_schema.cc',

diff --git a/src/lib/pgsql/tests/meson.build b/src/lib/pgsql/tests/meson.build
index e3a97d07e5221d02be744e7a5ed8b39335d9be2e..1ccd29f738d36628a3e84c84b9df0ac7a17b9beb 100644 (file)
--- a/src/lib/pgsql/tests/meson.build
+++ b/src/lib/pgsql/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 libs_testutils = [
     kea_pgsql_testutils_lib,
     kea_database_testutils_lib,

diff --git a/src/lib/pgsql/testutils/meson.build b/src/lib/pgsql/testutils/meson.build
index 06ca630ca4c2314ee9bcc52b3025dcfb544933a2..c9f58e05921573f4008e4e3c625f1c8b21175a1c 100644 (file)
--- a/src/lib/pgsql/testutils/meson.build
+++ b/src/lib/pgsql/testutils/meson.build
@@ -1,4 +1,7 @@
-DATABASE_SCRIPTS_DIR = f'@TOP_BUILD_DIR@/src/share/database/scripts'
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_pgsql_testutils_lib = static_library(
     'kea-pgsql-testutils',
     'pgsql_schema.cc',

diff --git a/src/lib/process/meson.build b/src/lib/process/meson.build
index 0f6cef14a22aeab56cb435773f044bad95107a4d..7f836d193ff5c47f62eaedf828a4e6987f31d0a4 100644 (file)
--- a/src/lib/process/meson.build
+++ b/src/lib/process/meson.build
@@ -12,7 +12,7 @@ kea_process_lib = library(
     'log_parser.cc',
     'process_messages.cc',
     'redact_config.cc',
-    cpp_args: [f'-DDATA_DIR="@TOP_BUILD_DIR@"'],
+    cpp_args: [f'-DDATA_DIR="@DHCP_DATA_DIR@"'],
     dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,

diff --git a/src/lib/stats/tests/meson.build b/src/lib/stats/tests/meson.build
index 7f25125feae2e885080cb7c77231d7b9bfc48a78..910360db442dd1c814dcde266c82d5dccd519327 100644 (file)
--- a/src/lib/stats/tests/meson.build
+++ b/src/lib/stats/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_stats_tests = executable(
     'kea-stats-tests',
     'context_unittest.cc',

diff --git a/src/lib/tcp/meson.build b/src/lib/tcp/meson.build
index 5ef4f3e1ad4db498c4adaad20e7ca90b4fe258de..d466f3c476ac9c5682d955ca17946272f6523d71 100644 (file)
--- a/src/lib/tcp/meson.build
+++ b/src/lib/tcp/meson.build
@@ -16,8 +16,8 @@ kea_tcp_lib = library(
 LIBS_BUILT_SO_FAR = [kea_tcp_lib] + LIBS_BUILT_SO_FAR
 kea_tcp_headers = [
     'mt_tcp_listener_mgr.h',
-    'tcp_connection_acceptor.h',
     'tcp_connection.h',
+    'tcp_connection_acceptor.h',
     'tcp_connection_pool.h',
     'tcp_listener.h',
     'tcp_log.h',

diff --git a/src/lib/testutils/meson.build b/src/lib/testutils/meson.build
index 719675e4c635a30960e194796764663a570cc98d..bb8a2fc6cd080b434f39f92ff980cefc6fa54d84 100644 (file)
--- a/src/lib/testutils/meson.build
+++ b/src/lib/testutils/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_testutils_lib = static_library(
     'kea-testutils',
     'io_utils.cc',

diff --git a/src/lib/util/tests/meson.build b/src/lib/util/tests/meson.build
index be98fb8d45373fec3503e6db3df914f1f7691918..cbfeb74bff0a4174969be74795d21650abb9ec44 100644 (file)
--- a/src/lib/util/tests/meson.build
+++ b/src/lib/util/tests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_util_tests = executable(
     'kea-util-tests',
     'bigint_unittest.cc',

diff --git a/src/lib/util/unittests/meson.build b/src/lib/util/unittests/meson.build
index a373ad130aa697cdeff0e97dd49eeb3cf5f91b16..827ee45e136889f1471b17ebe2679ecd2ebe8402 100644 (file)
--- a/src/lib/util/unittests/meson.build
+++ b/src/lib/util/unittests/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 kea_util_unittests_lib = static_library(
     'kea-util-unittests',
     'check_valgrind.cc',

diff --git a/src/lib/yang/meson.build b/src/lib/yang/meson.build
index c5c5f9520c9d801cd004bfcd829e839b7eb7960a..8d1d7896f5392d1d8a2af38d2d2896aeb413adab 100644 (file)
--- a/src/lib/yang/meson.build
+++ b/src/lib/yang/meson.build
@@ -32,18 +32,18 @@ kea_yang_lib = library(
 )
 LIBS_BUILT_SO_FAR = [kea_yang_lib] + LIBS_BUILT_SO_FAR
 kea_yang_headers = [
-    'adaptor_config.h',
     'adaptor.h',
+    'adaptor_config.h',
     'adaptor_host.h',
     'adaptor_option.h',
     'adaptor_pool.h',
     'adaptor_subnet.h',
     'netconf_error.h',
+    'translator.h',
     'translator_class.h',
     'translator_config.h',
     'translator_control_socket.h',
     'translator_database.h',
-    'translator.h',
     'translator_host.h',
     'translator_logger.h',
     'translator_option_data.h',

diff --git a/src/share/database/scripts/mysql/meson.build b/src/share/database/scripts/mysql/meson.build
index 988704049ee7069bdc53955598e9f7583d6f16b9..2c39f8eff77f2c33550de8dd93de205c0b4e179d 100644 (file)
--- a/src/share/database/scripts/mysql/meson.build
+++ b/src/share/database/scripts/mysql/meson.build
@@ -18,5 +18,51 @@ configure_file(
     output: 'dhcpdb_drop.mysql',
     copy: true,
 )
-# configure upgrade scripts
+upgrade_scripts = [
+    'upgrade_001.0_to_002.0.sh',
+    'upgrade_002.0_to_003.0.sh',
+    'upgrade_003.0_to_004.0.sh',
+    'upgrade_004.0_to_004.1.sh',
+    'upgrade_004.1_to_005.0.sh',
+    'upgrade_005.0_to_005.1.sh',
+    'upgrade_005.1_to_005.2.sh',
+    'upgrade_005.2_to_006.0.sh',
+    'upgrade_006.0_to_007.0.sh',
+    'upgrade_007.0_to_008.0.sh',
+    'upgrade_008.0_to_008.1.sh',
+    'upgrade_008.1_to_008.2.sh',
+    'upgrade_008.2_to_009.0.sh',
+    'upgrade_009.0_to_009.1.sh',
+    'upgrade_009.1_to_009.2.sh',
+    'upgrade_009.2_to_009.3.sh',
+    'upgrade_009.3_to_009.4.sh',
+    'upgrade_009.4_to_009.5.sh',
+    'upgrade_009.5_to_009.6.sh',
+    'upgrade_009.6_to_010.0.sh',
+    'upgrade_010_to_011.sh',
+    'upgrade_011_to_012.sh',
+    'upgrade_012_to_013.sh',
+    'upgrade_013_to_014.sh',
+    'upgrade_014_to_015.sh',
+    'upgrade_015_to_016.sh',
+    'upgrade_016_to_017.sh',
+    'upgrade_017_to_018.sh',
+    'upgrade_018_to_019.sh',
+    'upgrade_019_to_020.sh',
+    'upgrade_020_to_021.sh',
+    'upgrade_021_to_022.sh',
+    'upgrade_022_to_023.sh',
+    'upgrade_023_to_024.sh',
+    'upgrade_024_to_025.sh',
+    'upgrade_025_to_026.sh',
+    'upgrade_026_to_027.sh',
+    'upgrade_027_to_028.sh',
+]
+foreach file : upgrade_scripts
+    configure_file(
+        input: file + '.in',
+        output: file,
+        configuration: mysql_script_conf_data,
+    )
+endforeach
 # install

diff --git a/src/share/database/scripts/pgsql/meson.build b/src/share/database/scripts/pgsql/meson.build
index 15427d23f2c52eb658807e0be44b0db3988da9b8..f179fd2d7d78508707e140f06f9d48f7a3b5ea68 100644 (file)
--- a/src/share/database/scripts/pgsql/meson.build
+++ b/src/share/database/scripts/pgsql/meson.build
@@ -1,15 +1,12 @@
-postgresql_script_conf_data = configuration_data()
-postgresql_script_conf_data.set('prefix', get_option('prefix'))
-postgresql_script_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
-postgresql_script_conf_data.set(
-    'datarootdir',
-    '${prefix}/' + get_option('datadir'),
-)
-postgresql_script_conf_data.set('PACKAGE_NAME', 'kea')
+pgsql_script_conf_data = configuration_data()
+pgsql_script_conf_data.set('prefix', get_option('prefix'))
+pgsql_script_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
+pgsql_script_conf_data.set('datarootdir', '${prefix}/' + get_option('datadir'))
+pgsql_script_conf_data.set('PACKAGE_NAME', 'kea')
 configure_file(
     input: 'wipe_data.sh.in',
     output: 'wipe_data.sh',
-    configuration: postgresql_script_conf_data,
+    configuration: pgsql_script_conf_data,
 )
 configure_file(
     input: 'dhcpdb_create.pgsql',
@@ -21,5 +18,46 @@ configure_file(
     output: 'dhcpdb_drop.pgsql',
     copy: true,
 )
-# configure upgrade scripts
+upgrade_scripts = [
+    'upgrade_001.0_to_002.0.sh',
+    'upgrade_002.0_to_003.0.sh',
+    'upgrade_003.0_to_003.1.sh',
+    'upgrade_003.1_to_003.2.sh',
+    'upgrade_003.2_to_003.3.sh',
+    'upgrade_003.3_to_004.0.sh',
+    'upgrade_004.0_to_005.0.sh',
+    'upgrade_005.0_to_005.1.sh',
+    'upgrade_005.1_to_006.0.sh',
+    'upgrade_006.0_to_006.1.sh',
+    'upgrade_006.1_to_006.2.sh',
+    'upgrade_006.2_to_007.0.sh',
+    'upgrade_007_to_008.sh',
+    'upgrade_008_to_009.sh',
+    'upgrade_009_to_010.sh',
+    'upgrade_010_to_011.sh',
+    'upgrade_011_to_012.sh',
+    'upgrade_012_to_013.sh',
+    'upgrade_013_to_014.sh',
+    'upgrade_014_to_015.sh',
+    'upgrade_015_to_016.sh',
+    'upgrade_016_to_017.sh',
+    'upgrade_017_to_018.sh',
+    'upgrade_018_to_019.sh',
+    'upgrade_019_to_020.sh',
+    'upgrade_020_to_021.sh',
+    'upgrade_021_to_022.sh',
+    'upgrade_022_to_023.sh',
+    'upgrade_023_to_024.sh',
+    'upgrade_024_to_025.sh',
+    'upgrade_025_to_026.sh',
+    'upgrade_026_to_027.sh',
+    'upgrade_027_to_028.sh',
+]
+foreach file : upgrade_scripts
+    configure_file(
+        input: file + '.in',
+        output: file,
+        configuration: pgsql_script_conf_data,
+    )
+endforeach
 # install