From 04c0e5212d53e8018f631927bd7d07edd724b77c Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Thu, 18 Apr 2019 20:14:31 +0200 Subject: [PATCH] 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 Reviewed-by: Martin Schwenke Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Thu May 9 04:24:56 UTC 2019 on sn-devel-184 --- ctdb/wscript | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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)