[#3729] Checkpoint: improvements

diff --git a/src/lib/asiolink/meson.build b/src/lib/asiolink/meson.build
index 6dbfa4928e592501f47919e54d1adae22cbc89ea..57a65fe18bbfe663b97770a69dde24764fca1754 100644 (file)
--- 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 ae115ea1e23bfcded85467a5f943b71257e205a4..6afb0281abc533b04ac96cdc1cc430a758724a29 100644 (file)
--- 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 3afadcd3a13e4b7c9e344310b65b2370bba6ceb8..37dc8fe927e7d1f914eafe9a547f07e5019eaf55 100755 (executable)
--- 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 7c22de092ed573195ab72fa28e0182011e8f61a2..a724924e033926b4745ac3dd8bf3b7709ced0fd6 100644 (file)
--- 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 da5660aa01e5556aba9fd6f073e476e005b24ef7..c8d097a1887fd58bd51a017812be2bf3e5322f20 100644 (file)
--- 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')