From: Günther Deschner Date: Mon, 15 Jan 2018 22:20:39 +0000 (+0100) Subject: build: fix libceph-common detection X-Git-Tag: samba-4.6.15~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85fc0d5d0100c0396daf51017ffa0051ba543048;p=thirdparty%2Fsamba.git build: fix libceph-common detection BUG: https://bugzilla.samba.org/show_bug.cgi?id=13277 Guenther Signed-off-by: Guenther Deschner Reviewed-by: David Disseldorp Autobuild-User(master): Günther Deschner Autobuild-Date(master): Thu Feb 22 19:30:12 CET 2018 on sn-devel-144 (cherry picked from commit 6a59619844e0def505a6bfa778c17721c062e0ee) --- diff --git a/source3/wscript b/source3/wscript index 06fbf8cb261..3130079cb96 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1579,11 +1579,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',