Skip to content

Commit

Permalink
build: fix libceph-common detection
Browse files Browse the repository at this point in the history
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13277

Guenther

Signed-off-by: Guenther Deschner <[email protected]>
Reviewed-by: David Disseldorp <[email protected]>

Autobuild-User(master): Günther Deschner <[email protected]>
Autobuild-Date(master): Thu Feb 22 19:30:12 CET 2018 on sn-devel-144
  • Loading branch information
gd committed Feb 22, 2018
1 parent 8c83347 commit 6a59619
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions source3/wscript
Original file line number Diff line number Diff line change
Expand Up @@ -1526,11 +1526,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',
Expand Down

0 comments on commit 6a59619

Please sign in to comment.