waf: only use libsystemd-daemon if linking it actually succeeds

Alexander Bokovoy ab at samba.org
Wed Jun 4 23:20:25 MDT 2014


Hi,

Attached patch should fix a case when there are headers available as
systemd/daemon.h but linking with libsystemd-daemon actually fails.

Thanks Reuben Farrelly for the report of failure on Gentoo.
-- 
/ Alexander Bokovoy
-------------- next part --------------
>From cc1e4e8a54156b3d187483c792ed294089e92bb6 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab at samba.org>
Date: Thu, 5 Jun 2014 08:15:13 +0300
Subject: [PATCH] WAF: use libsystemd-daemon only if linking actually succeeds

---
 wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wscript b/wscript
index 58af180..a8cdd14 100644
--- a/wscript
+++ b/wscript
@@ -204,7 +204,7 @@ def configure(conf):
         conf.CHECK_HEADERS('systemd/sd-daemon.h', lib='systemd-daemon')
         conf.CHECK_LIB('systemd-daemon', shlib=True)
 
-    if conf.CONFIG_SET('HAVE_SYSTEMD_SD_DAEMON_H'):
+    if conf.CONFIG_SET('HAVE_SYSTEMD_SD_DAEMON_H') and conf.CONFIG_SET('HAVE_LIBSYSTEMD_DAEMON'):
         conf.DEFINE('HAVE_SYSTEMD', '1')
         conf.env['ENABLE_SYSTEMD'] = True
     else:
-- 
1.9.3



More information about the samba-technical mailing list