From 2b5dbb352553699afce62dca4964eb0bd64477f8 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 26 Mar 2019 18:12:04 +0100 Subject: [PATCH] build: add explicit cephfs include path for vfs_ceph builds Needed if building with a custom --with-libcephfs path. Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison --- ctdb/wscript | 2 +- source3/modules/wscript_build | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ctdb/wscript b/ctdb/wscript index 3fa525b564d..7873130d5ee 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -682,7 +682,7 @@ def build(bld): bld.SAMBA_BINARY('ctdb_mutex_ceph_rados_helper', source='utils/ceph/ctdb_mutex_ceph_rados_helper.c', deps='talloc tevent rados ceph-common', - includes='include', + includes=bld.CONFIG_GET('CPPPATH_RADOS'), install_path='${CTDB_HELPER_BINDIR}') sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g' % (bld.env.CTDB_VARDIR) diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build index 3d19b01908c..8d0e0ee57c1 100644 --- a/source3/modules/wscript_build +++ b/source3/modules/wscript_build @@ -519,7 +519,8 @@ bld.SAMBA3_MODULE('vfs_ceph', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_ceph'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_ceph'), - cflags=bld.CONFIG_GET('CFLAGS_CEPHFS')) + cflags=bld.CONFIG_GET('CFLAGS_CEPHFS'), + includes=bld.CONFIG_GET('CPPPATH_CEPHFS')) bld.SAMBA3_MODULE('vfs_glusterfs', subsystem='vfs', -- 2.34.1