[#3333] updated meson files

diff --git a/src/hooks/d2/Makefile.am b/src/hooks/d2/Makefile.am
index bc21b1afd1ba2806d59eb9ddd79850302a641685..ecc8d6e2b7dbaba80fb9d68530b24e2fd05681f8 100644 (file)
--- a/src/hooks/d2/Makefile.am
+++ b/src/hooks/d2/Makefile.am
@@ -1 +1,4 @@
-SUBDIRS = gss_tsig
+SUBDIRS =
+if HAVE_GSSAPI
+SUBDIRS += gss_tsig
+endif

diff --git a/src/hooks/d2/gss_tsig/Makefile.am b/src/hooks/d2/gss_tsig/Makefile.am
index a1b5302116c8521c1645aace784e8eeec9768a00..ca73ef38980d2e22545f267d6cad9ac1eae572d0 100644 (file)
--- a/src/hooks/d2/gss_tsig/Makefile.am
+++ b/src/hooks/d2/gss_tsig/Makefile.am
@@ -1,4 +1,3 @@
-if HAVE_GSSAPI
 SUBDIRS = . testutils libloadtests tests
 
 AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
@@ -96,5 +95,3 @@ messages gss_tsig_messages.h gss_tsig_messages.cc:
        @echo Messages generation disabled. Configure with --enable-generate-messages to enable it.
 
 endif
-
-endif

diff --git a/src/hooks/d2/gss_tsig/meson.build b/src/hooks/d2/gss_tsig/meson.build
index 8b94588ccb97bba7b9a29762d5d1b4e59ac9d730..d8a90d53fded95898998bfa9aaf7f14c5b7ba8c6 100644 (file)
--- a/src/hooks/d2/gss_tsig/meson.build
+++ b/src/hooks/d2/gss_tsig/meson.build
@@ -32,7 +32,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-d2-gss_tsig-gss_tsig_messages',
+        'src-hooks-d2-gss_tsig-gss_tsig_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,

diff --git a/src/hooks/dhcp/class_cmds/meson.build b/src/hooks/dhcp/class_cmds/meson.build
index 77cadb9b6c1233f1a950fe4489b8fdecabd999d4..4c3d82c7a330a60918d0916d341c0c0b721aed36 100644 (file)
--- a/src/hooks/dhcp/class_cmds/meson.build
+++ b/src/hooks/dhcp/class_cmds/meson.build
@@ -21,7 +21,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-class_cmds-class_cmds_messages',
+        'src-hooks-dhcp-class_cmds-class_cmds_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,

diff --git a/src/hooks/dhcp/ddns_tuning/meson.build b/src/hooks/dhcp/ddns_tuning/meson.build
index 2d2879b39802c24f3c0c2371501a42ec8e78571b..c25010c94f7c7b05ca3b7e900413b4204b783f96 100644 (file)
--- a/src/hooks/dhcp/ddns_tuning/meson.build
+++ b/src/hooks/dhcp/ddns_tuning/meson.build
@@ -22,7 +22,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-ddns_tuning-ddns_tuning_messages',
+        'src-hooks-dhcp-ddns_tuning-ddns_tuning_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,

diff --git a/src/hooks/dhcp/flex_id/meson.build b/src/hooks/dhcp/flex_id/meson.build
index 277b9f1456d77ba53c0c0a32f5b48834331e0fc3..b8fb90bf1e39adf8a6d21bc9bfd125aa2e3789d5 100644 (file)
--- a/src/hooks/dhcp/flex_id/meson.build
+++ b/src/hooks/dhcp/flex_id/meson.build
@@ -21,7 +21,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-flex_id-flex_id_messages',
+        'src-hooks-dhcp-flex_id-flex_id_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,

diff --git a/src/hooks/dhcp/forensic_log/meson.build b/src/hooks/dhcp/forensic_log/meson.build
index 471545554d1c10753e9a12cc4b7a02be9a313322..c3751c3f0ae8717530372810abbe2e55d51a8608 100644 (file)
--- a/src/hooks/dhcp/forensic_log/meson.build
+++ b/src/hooks/dhcp/forensic_log/meson.build
@@ -35,7 +35,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-forensic_log-legal_log_messages',
+        'src-hooks-dhcp-forensic_log-legal_log_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,

diff --git a/src/hooks/dhcp/host_cache/meson.build b/src/hooks/dhcp/host_cache/meson.build
index 3a4f1fe2c1b0a47a60912b960fb53f88cdb91b96..9584c29fa851148e6e734503b108b1b19de05206 100644 (file)
--- a/src/hooks/dhcp/host_cache/meson.build
+++ b/src/hooks/dhcp/host_cache/meson.build
@@ -24,7 +24,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-host_cache-host_cache_messages',
+        'src-hooks-dhcp-host_cache-host_cache_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,

diff --git a/src/hooks/dhcp/host_cmds/meson.build b/src/hooks/dhcp/host_cmds/meson.build
index 3a34ea90dcb15b2c5d75ff9e83973c040538655d..d14900e37d2c2e3d4a0ac1084cee4bdffefeef6b 100644 (file)
--- a/src/hooks/dhcp/host_cmds/meson.build
+++ b/src/hooks/dhcp/host_cmds/meson.build
@@ -21,7 +21,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-host_cmds-host_cmds_messages',
+        'src-hooks-dhcp-host_cmds-host_cmds_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,

diff --git a/src/hooks/dhcp/lease_cmds/binding_variables.cc b/src/hooks/dhcp/lease_cmds/binding_variables.cc
index a47ec9b8fddf4e8fd40dbf80ae2f110873472ae7..d1643cf0f2376f83a26b60d9593fba5040c0e67e 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/binding_variables.cc
+++ b/src/hooks/dhcp/lease_cmds/binding_variables.cc
@@ -1,8 +1,9 @@
 // Copyright (C) 2025 Internet Systems Consortium, Inc. ("ISC")
 //
-// This Source Code Form is subject to the terms of the Kea Hooks Basic
-// Commercial End User License Agreement v2.0. See COPYING file in the premium/
-// directory.
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 
 #include <config.h>
 

diff --git a/src/hooks/dhcp/lease_cmds/binding_variables.h b/src/hooks/dhcp/lease_cmds/binding_variables.h
index 131b6844b9071bd1b3661e6f304b3a52c5169025..88fdaa1c29545dfb407f463cbae19b701cbd8841 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/binding_variables.h
+++ b/src/hooks/dhcp/lease_cmds/binding_variables.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2025 Internet Systems Consortium, Inc. ("ISC")
 //
-// This Source Code Form is subject to the terms of the Kea Hooks Basic
-// Commercial End User License Agreement v2.0. See COPYING file in the premium/
-// directory.
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #ifndef BINDING_VARIABLES_H
 #define BINDING_VARIABLES_H

diff --git a/src/hooks/dhcp/lease_query/meson.build b/src/hooks/dhcp/lease_query/meson.build
index aaadc24483ab0e48edebd3432b5625769b582b26..485d23eb4afd3101f904a897fbf773cdc1cedaad 100644 (file)
--- a/src/hooks/dhcp/lease_query/meson.build
+++ b/src/hooks/dhcp/lease_query/meson.build
@@ -29,7 +29,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-lease_query-lease_query_messages',
+        'src-hooks-dhcp-lease_query-lease_query_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,

diff --git a/src/hooks/dhcp/limits/meson.build b/src/hooks/dhcp/limits/meson.build
index 0fa22d6be6825d03f28b799de6f7f3e97120a8b4..935502bfc743fceb6cab61e6fff1891db5826fb1 100644 (file)
--- a/src/hooks/dhcp/limits/meson.build
+++ b/src/hooks/dhcp/limits/meson.build
@@ -24,7 +24,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-limits-limits_messages',
+        'src-hooks-dhcp-limits-limits_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,

diff --git a/src/hooks/dhcp/perfmon/Makefile.am b/src/hooks/dhcp/perfmon/Makefile.am
index 2f5f29c82c775cf169fe1e65c1cd667723bf8fba..f0a754d3a79636d9f1823007b6154c15d589dc92 100644 (file)
--- a/src/hooks/dhcp/perfmon/Makefile.am
+++ b/src/hooks/dhcp/perfmon/Makefile.am
@@ -82,7 +82,7 @@ messages: perfmon_messages.h perfmon_messages.cc
 
 perfmon_messages.h perfmon_messages.cc: perfmon_messages.mes
        (cd $(top_srcdir); \
-       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/perfmon/perfmon_messages.mes
+       $(abs_top_builddir)/src/lib/log/compiler/kea-msg-compiler src/hooks/dhcp/perfmon/perfmon_messages.mes)
 
 else
 

diff --git a/src/hooks/dhcp/ping_check/meson.build b/src/hooks/dhcp/ping_check/meson.build
index 086f248bd34be999722ebdbbf5b7ae3cb7d681da..5245d9de1741a19ec319cf7a65a27f7e93089d8d 100644 (file)
--- a/src/hooks/dhcp/ping_check/meson.build
+++ b/src/hooks/dhcp/ping_check/meson.build
@@ -27,7 +27,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-ping_check-ping_check_messages',
+        'src-hooks-dhcp-ping_check-ping_check_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,

diff --git a/src/hooks/dhcp/radius/meson.build b/src/hooks/dhcp/radius/meson.build
index 3d9500b97418ec45b1f9b943c2c53d397dac35ba..c0dd0e01ff583cf95b123af0a0bf8c9a90179ce8 100644 (file)
--- a/src/hooks/dhcp/radius/meson.build
+++ b/src/hooks/dhcp/radius/meson.build
@@ -42,7 +42,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-radius-radius_messages',
+        'src-hooks-dhcp-radius-radius_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,

diff --git a/src/hooks/dhcp/subnet_cmds/meson.build b/src/hooks/dhcp/subnet_cmds/meson.build
index 156c6e897b6adf33b68b9fcca1fe503428ea19bb..5c13a65a1fe0b20b571285c30afda754417540af 100644 (file)
--- a/src/hooks/dhcp/subnet_cmds/meson.build
+++ b/src/hooks/dhcp/subnet_cmds/meson.build
@@ -21,7 +21,7 @@ subdir('tests')
 
 if KEA_MSG_COMPILER.found()
     target_gen_messages = run_target(
-        'premium-src-hooks-dhcp-subnet_cmds-subnet_cmds_messages',
+        'src-hooks-dhcp-subnet_cmds-subnet_cmds_messages',
         command: [
             CD_AND_RUN,
             TOP_SOURCE_DIR,