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>

diff --git a/ctdb/wscript b/ctdb/wscript
index 3fa525b564da837b3b82429236129d2d3d2aaf6c..7873130d5ee6efe89deaf322a4af64df51977b3e 100644 (file)
--- 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 3d19b01908c212784ca61f103e96bd97f4bc52d7..8d0e0ee57c1b788a9944923f90007c3d2bab6706 100644 (file)
--- 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',