[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  04c0e5212d5 ctdb/build: fix ctdb_mutex_ceph_rados_helper builds
      from  ae9fb93393b s4 lib socket: Ensure address string owned by parent struct

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


- Log -----------------------------------------------------------------
commit 04c0e5212d53e8018f631927bd7d07edd724b77c
Author: David Disseldorp <ddiss at samba.org>
Date:   Thu Apr 18 20:14:31 2019 +0200

    ctdb/build: fix ctdb_mutex_ceph_rados_helper builds
    
    2b5dbb352553699afce62dca4964eb0bd64477f8 fixed builds with an explicit
    --with-libcephfs but broke builds against system Ceph libraries. This
    change handles both cases.
    
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Thu May  9 04:24:56 UTC 2019 on sn-devel-184

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

Summary of changes:
 ctdb/wscript | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/wscript b/ctdb/wscript
index eccc5e76f48..614e042bd70 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -680,10 +680,13 @@ def build(bld):
                           destname='README')
 
     if bld.env.HAVE_LIBRADOS:
+        rados_inc = ' include'
+        if bld.CONFIG_GET('CPPPATH_RADOS') is not None:
+            rados_inc = bld.CONFIG_GET('CPPPATH_RADOS') + rados_inc
         bld.SAMBA_BINARY('ctdb_mutex_ceph_rados_helper',
                          source='utils/ceph/ctdb_mutex_ceph_rados_helper.c',
 			 deps='talloc tevent rados ceph-common',
-			 includes=bld.CONFIG_GET('CPPPATH_RADOS'),
+			 includes=rados_inc,
 			 install_path='${CTDB_HELPER_BINDIR}')
 
     sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g'  % (bld.env.CTDB_VARDIR)


-- 
Samba Shared Repository