From: Francis Dupont <fdupont@isc.org>
Date: Thu, 6 Feb 2025 16:48:56 +0000 (+0100)
Subject: [#3729] Checkpoint: improvements
X-Git-Tag: Kea-2.7.7~253
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=253527aafb8a36cb7d7ae5c99348581d0acd59ea;p=thirdparty%2Fkea.git

[#3729] Checkpoint: improvements
---

diff --git a/src/lib/asiolink/meson.build b/src/lib/asiolink/meson.build
index 6dbfa4928e..57a65fe18b 100644
--- a/src/lib/asiolink/meson.build
+++ b/src/lib/asiolink/meson.build
@@ -19,6 +19,7 @@ kea_asiolink_lib = library(
     install: true,
     install_dir: 'lib',
     link_with: LIBS_BUILT_SO_FAR,
+    # Avoids: ld: error: undefined symbol: environ on FreeBSD
     override_options: ENVIRON_SHLIB_FLAGS,
 )
 LIBS_BUILT_SO_FAR = [kea_asiolink_lib] + LIBS_BUILT_SO_FAR
diff --git a/src/lib/process/testutils/meson.build b/src/lib/process/testutils/meson.build
index ae115ea1e2..6afb0281ab 100644
--- a/src/lib/process/testutils/meson.build
+++ b/src/lib/process/testutils/meson.build
@@ -6,7 +6,7 @@ kea_process_testutils_lib = static_library(
     'kea-process-testutils',
     'd_test_stubs.cc',
     cpp_args: [f'-DDATABASE_SCRIPTS_DIR="@DATABASE_SCRIPTS_DIR@"'],
-    dependencies: [boost],
+    dependencies: [boost, gtest],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
diff --git a/src/share/api/grabber.sh b/src/share/api/grabber.sh
index 3afadcd3a1..37dc8fe927 100755
--- a/src/share/api/grabber.sh
+++ b/src/share/api/grabber.sh
@@ -2,5 +2,5 @@
 
 for i in [a-z]*.json
 do
-    echo $i
+    echo "$i"
 done
diff --git a/src/share/database/scripts/mysql/meson.build b/src/share/database/scripts/mysql/meson.build
index 7c22de092e..a724924e03 100644
--- a/src/share/database/scripts/mysql/meson.build
+++ b/src/share/database/scripts/mysql/meson.build
@@ -16,7 +16,7 @@ configure_file(
 )
 
 mysql_script_conf_data = configuration_data()
-mysql_script_conf_data.set('prefix', get_option('prefix'))
+mysql_script_conf_data.set('prefix', PREFIX)
 mysql_script_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
 mysql_script_conf_data.set('datarootdir', '${prefix}/' + DATADIR)
 mysql_script_conf_data.set('PACKAGE_NAME', 'kea')
diff --git a/src/share/database/scripts/pgsql/meson.build b/src/share/database/scripts/pgsql/meson.build
index da5660aa01..c8d097a188 100644
--- a/src/share/database/scripts/pgsql/meson.build
+++ b/src/share/database/scripts/pgsql/meson.build
@@ -16,7 +16,7 @@ configure_file(
 )
 
 pgsql_script_conf_data = configuration_data()
-pgsql_script_conf_data.set('prefix', get_option('prefix'))
+pgsql_script_conf_data.set('prefix', PREFIX)
 pgsql_script_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
 pgsql_script_conf_data.set('datarootdir', '${prefix}/' + DATADIR)
 pgsql_script_conf_data.set('PACKAGE_NAME', 'kea')