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@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Thu May  9 04:24:56 UTC 2019 on sn-devel-184

diff --git a/ctdb/wscript b/ctdb/wscript
index eccc5e76f48f8b5522b12d96b94fe17daf6b23da..614e042bd70fc6cc1fbc7d0747c97a89e59b560b 100644 (file)
--- 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)