From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Sat, 25 Jul 2020 14:46:13 +0000 (+0200)
Subject: meson: don't pass libsystemd version to C preprocessor
X-Git-Tag: v5.1.3~22^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cb21a63556c574033a5232be4a02fb36df88b03;p=thirdparty%2Fknot-resolver.git

meson: don't pass libsystemd version to C preprocessor

We don't use it anymore, and on some systems it's apparently
not an integer.
---

diff --git a/NEWS b/NEWS
index 7a7cdce5e..9cef9085e 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Bugfixes
 --------
 - tls: fix compilation to support net.tls_sticket_secret() (!1021)
 - validator: ignore bogus RRSIGs present in insecure domains (!1022, #587)
+- build if libsystemd version isn't detected as integer (#592, !1029)
 
 
 Knot Resolver 5.1.2 (2020-07-01)
diff --git a/daemon/main.c b/daemon/main.c
index 01eaba927..3295cd0d6 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -34,7 +34,7 @@
 
 #include <lua.h>
 #include <uv.h>
-#if SYSTEMD_VERSION > 0
+#if ENABLE_LIBSYSTEMD
 #include <systemd/sd-daemon.h>
 #endif
 #include <libknot/error.h>
@@ -277,7 +277,7 @@ static int run_worker(uv_loop_t *loop, struct engine *engine, fd_array_t *ipc_se
 	memcpy(&engine->ipc_set, ipc_set, sizeof(*ipc_set));
 
 	/* Notify supervisor. */
-#if SYSTEMD_VERSION > 0
+#if ENABLE_LIBSYSTEMD
 	sd_notify(0, "READY=1");
 #endif
 	/* Run event loop */
diff --git a/meson.build b/meson.build
index b3d56e22d..6d732e186 100644
--- a/meson.build
+++ b/meson.build
@@ -165,8 +165,7 @@ conf_data.set_quoted('libzscanner_SONAME',
   libzscanner.get_pkgconfig_variable('soname'))
 conf_data.set_quoted('libknot_SONAME',
   libknot.get_pkgconfig_variable('soname'))
-conf_data.set('SYSTEMD_VERSION',
-  libsystemd.found() ? libsystemd.version().to_int() : -1)
+conf_data.set('ENABLE_LIBSYSTEMD', libsystemd.found() ? 1 : 0)
 conf_data.set('NOVERBOSELOG', not verbose_log)
 conf_data.set('ENABLE_SENDMMSG', sendmmsg.to_int())
 conf_data.set('ENABLE_CAP_NG', capng.found())