diff options
| author | David Disseldorp <ddiss@samba.org> | 2019-06-18 14:35:02 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-09-02 02:25:29 +0000 |
| commit | dfa4dcf386febdf1b77ba963f11bcc2a44f8a738 (patch) | |
| tree | dc3bb8a29f733d0eb11daa5516d9d545ccfe94b7 /source3/wscript | |
| parent | b76bf7afd07924e65cccbee7614b462312d4437c (diff) | |
| download | samba-dfa4dcf386febdf1b77ba963f11bcc2a44f8a738.tar.gz | |
build: drop --with-libcephfs=<path> support
--with-libcephfs=<path> provides a mechanism for explicitly specifying
header and library paths for Ceph. This adds unnecessary complexity and
can be achieved using generic compiler environment variables (e.g.
GCC LIBRARY_PATH and C_INCLUDE_PATH), so drop --with-libcephfs support.
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3/wscript')
| -rw-r--r-- | source3/wscript | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/wscript b/source3/wscript index 3118abd738b..db8f83ef576 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1554,15 +1554,14 @@ main() { conf.env['CFLAGS_CEPHFS'] = "-D_FILE_OFFSET_BITS=64" if Options.options.libcephfs_dir: - 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' + Logs.error('''--with-libcephfs no longer supported, please use compiler + flags instead, e.g. GCC LIBRARY_PATH and C_INCLUDE_PATH''') + sys.exit(1) 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') |