summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ctdb/wscript3
-rw-r--r--source3/wscript4
2 files changed, 2 insertions, 5 deletions
diff --git a/ctdb/wscript b/ctdb/wscript
index 8ce5a0953be..c67725204a2 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -262,7 +262,6 @@ def configure(conf):
if Options.options.ctdb_ceph_reclock:
if (conf.CHECK_HEADERS('rados/librados.h', False, False, 'rados') and
conf.CHECK_LIB('rados', shlib=True)):
- conf.CHECK_LIB('ceph-common', shlib=True)
Logs.info('Building with Ceph librados recovery lock support')
conf.define('HAVE_LIBRADOS', 1)
else:
@@ -682,7 +681,7 @@ def build(bld):
if bld.env.HAVE_LIBRADOS:
bld.SAMBA_BINARY('ctdb_mutex_ceph_rados_helper',
source='utils/ceph/ctdb_mutex_ceph_rados_helper.c',
- deps='talloc tevent rados ceph-common',
+ deps='talloc tevent rados',
includes='include',
install_path='${CTDB_HELPER_BINDIR}')
diff --git a/source3/wscript b/source3/wscript
index db8f83ef576..1dc5abf0ab6 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1561,11 +1561,9 @@ main() {
if (Options.options.with_cephfs and
conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and
conf.CHECK_LIB('cephfs', shlib=True)):
- conf.env['LIBPATH_CEPH-COMMON'] = Options.options.LIBDIR + '/ceph'
- 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',
+ if conf.CHECK_FUNCS_IN('ceph_statx', 'cephfs',
headers='cephfs/libcephfs.h'):
conf.DEFINE('HAVE_CEPH_STATX', '1')
else: