[#3982] Addressed comments

diff --git a/changelog_unreleased/3982-kea-meson-build-cross-compile b/changelog_unreleased/3982-kea-meson-build-cross-compile
new file mode 100644 (file)
index 0000000..edf16a5
--- /dev/null
+++ b/changelog_unreleased/3982-kea-meson-build-cross-compile
@@ -0,0 +1,3 @@
+[build]                fdupont
+       Kea can now be cross-compiled using Meson.
+       (Gitlab #3982)

diff --git a/meson.build b/meson.build
index e7db5806cc8e76864d4cbd2319be13a55fdd81a3..1becceeafccc2c4c9e39916cb39137ffa805379e 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -306,11 +306,14 @@ if netconf_opt.allowed()
 endif
 
 # Google Test
-GTEST_DEP = dependency(
-    'gtest',
-    fallback: ['gtest', 'gtest_dep'],
-    required: FUZZ_OPT.enabled() or TESTS_OPT.enabled(),
-)
+GTEST_DEP = disabler()
+if FUZZ_OPT.enabled() or TESTS_OPT.enabled()
+    GTEST_DEP = dependency(
+        'gtest',
+        fallback: ['gtest', 'gtest_dep'],
+        required: true,
+    )
+endif
 
 # Crypto
 if crypto_opt == 'botan'
@@ -531,14 +534,6 @@ if MYSQL_DEP.found()
     conf_data.set('HAVE_MYSQL_GET_OPTION', result)
 endif
 
-if FUZZ_OPT.enabled()
-    result = cpp.run(
-        fs.read('compiler-checks/fuzzing-with-clusterfuzzlite.cc'),
-        name: 'FUZZING_WITH_CLUSTERFUZZLITE',
-    )
-    FUZZING_WITH_CLUSTERFUZZLITE = result.returncode() == 0
-endif
-
 have_afl = cpp.has_define('__AFL_COMPILER')
 conf_data.set('HAVE_AFL', have_afl)
 
@@ -834,7 +829,7 @@ result = cpp.get_define(
 if result != ''
     version = result.strip()
 else
-    version = log4cplus.version()
+    version = LOG4CPLUS_DEP.version()
 endif
 if version == 'unknown'
     version = 'unknown version'