diff options
| author | David Disseldorp <ddiss@samba.org> | 2019-03-26 18:12:04 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2019-04-12 18:38:20 +0000 |
| commit | 2b5dbb352553699afce62dca4964eb0bd64477f8 (patch) | |
| tree | 652f2d5324f6e8dc74d5281345bcfb4d4ab8e336 | |
| parent | 289201277cd983b27cdfd5376c607eab112b4082 (diff) | |
| download | samba-2b5dbb352553699afce62dca4964eb0bd64477f8.tar.gz | |
build: add explicit cephfs include path for vfs_ceph builds
Needed if building with a custom --with-libcephfs path.
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | ctdb/wscript | 2 | ||||
| -rw-r--r-- | 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', |