The branch, v4-7-test has been updated via b276495 build: fix libceph-common detection from 4978ee1 subnet: Avoid a segfault when renaming subnet objects
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-7-test - Log ----------------------------------------------------------------- commit b27649592001ef64f255380eade6246554c1e216 Author: Günther Deschner <g...@samba.org> Date: Mon Jan 15 23:20:39 2018 +0100 build: fix libceph-common detection BUG: https://bugzilla.samba.org/show_bug.cgi?id=13277 Guenther Signed-off-by: Guenther Deschner <g...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> Autobuild-User(master): Günther Deschner <g...@samba.org> Autobuild-Date(master): Thu Feb 22 19:30:12 CET 2018 on sn-devel-144 (cherry picked from commit 6a59619844e0def505a6bfa778c17721c062e0ee) Autobuild-User(v4-7-test): Karolin Seeger <ksee...@samba.org> Autobuild-Date(v4-7-test): Wed Feb 28 16:51:15 CET 2018 on sn-devel-144 ----------------------------------------------------------------------- Summary of changes: source3/wscript | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/wscript b/source3/wscript index 6823e0a..611af5b 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1583,11 +1583,13 @@ main() { conf.env['CPPPATH_CEPHFS'] = Options.options.libcephfs_dir + '/include' conf.env['LIBPATH_CEPHFS'] = Options.options.libcephfs_dir + '/lib' conf.env['LIBPATH_CEPH-COMMON'] = Options.options.libcephfs_dir + '/lib/ceph' + else: + conf.env['LIBPATH_CEPH-COMMON'] = Options.options.LIBDIR + '/ceph' if (Options.options.with_cephfs and conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and - conf.CHECK_LIB('cephfs', shlib=True) and - conf.CHECK_LIB('ceph-common', shlib=True)): + conf.CHECK_LIB('cephfs', shlib=True)): + conf.CHECK_LIB('ceph-common', shlib=True) if Options.options.with_acl_support: conf.DEFINE('HAVE_CEPH', '1') if conf.CHECK_FUNCS_IN('ceph_statx', 'cephfs ceph-common', -- Samba Shared Repository