[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  8855906 WAF: use libsystemd-daemon only if linking actually succeeds
      from  184f89d Add YouCompleteMe config.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 88559063b54585677063394b5802f0c85ac7c22b
Author: Alexander Bokovoy <ab at samba.org>
Date:   Thu Jun 5 08:15:13 2014 +0300

    WAF: use libsystemd-daemon only if linking actually succeeds
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Thu Jun  5 17:16:22 CEST 2014 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 wscript |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/wscript b/wscript
index 58af180..cf4e93b 100644
--- a/wscript
+++ b/wscript
@@ -204,7 +204,8 @@ 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:


-- 
Samba Shared Repository