X-Git-Url: http://git.samba.org/?p=samba.git;a=blobdiff_plain;f=source3%2Fwscript;h=e0db9839795d468ddd7e265c985cf721ecd6944c;hp=8fa51fb77404c0a776942bed5d684771616118fb;hb=ccb645321460034d4f33674854877620810b83e0;hpb=06cdf8d7c4402b52aa27631a5556dde0b22d9487 diff --git a/source3/wscript b/source3/wscript index 8fa51fb7740..e0db9839795 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1,20 +1,23 @@ #!/usr/bin/env python -srcdir=".." +srcdir = ".." import sys, os from optparse import SUPPRESS_HELP -sys.path.insert(0, srcdir+"/buildtools/wafsamba") +sys.path.insert(0, srcdir + "/buildtools/wafsamba") sys.path.insert(0, "source3") -import wafsamba, Options, Logs, Utils, Scripting + +from waflib import Options, Logs, Errors +import wafsamba import build.charset -import samba_utils, samba_version +from wafsamba import samba_utils +from samba_utils import TO_LIST import samba3 -import bison, flex +from waflib.Tools import bison, flex default_prefix = Options.default_prefix = '/usr/local/samba' -def set_options(opt): +def options(opt): opt.add_option('--with-static-modules', help=("Comma-separated list of names of modules to statically link in. "+ @@ -37,49 +40,47 @@ def set_options(opt): "--with-shared-modules"), action="store", dest='shared_modules', default=None) - opt.SAMBA3_ADD_OPTION('winbind') - opt.SAMBA3_ADD_OPTION('ads') - opt.SAMBA3_ADD_OPTION('ldap') - opt.SAMBA3_ADD_OPTION('cups', with_name="enable", without_name="disable") - opt.SAMBA3_ADD_OPTION('iprint', with_name="enable", without_name="disable") - opt.SAMBA3_ADD_OPTION('pam') - opt.SAMBA3_ADD_OPTION('quotas') - opt.SAMBA3_ADD_OPTION('sendfile-support') - opt.SAMBA3_ADD_OPTION('utmp') - opt.SAMBA3_ADD_OPTION('avahi', with_name="enable", without_name="disable") - opt.SAMBA3_ADD_OPTION('iconv') - opt.SAMBA3_ADD_OPTION('acl-support') - opt.SAMBA3_ADD_OPTION('dnsupdate') - opt.SAMBA3_ADD_OPTION('syslog') - opt.SAMBA3_ADD_OPTION('automount') - opt.SAMBA3_ADD_OPTION('dmapi', default=None) # None means autodetection - opt.SAMBA3_ADD_OPTION('fam', default=None) # None means autodetection - opt.SAMBA3_ADD_OPTION('profiling-data', default=False) - opt.SAMBA3_ADD_OPTION('libarchive', default=None) - - opt.SAMBA3_ADD_OPTION('cluster-support', default=False) - - opt.SAMBA3_ADD_OPTION('regedit', default=None) - - opt.SAMBA3_ADD_OPTION('fake-kaserver', + opt.samba_add_onoff_option('winbind') + opt.samba_add_onoff_option('ads') + opt.samba_add_onoff_option('ldap') + opt.samba_add_onoff_option('cups', with_name="enable", without_name="disable") + opt.samba_add_onoff_option('iprint', with_name="enable", without_name="disable") + opt.samba_add_onoff_option('pam') + opt.samba_add_onoff_option('quotas', default=None) + opt.samba_add_onoff_option('sendfile-support', default=None) + opt.samba_add_onoff_option('utmp') + opt.samba_add_onoff_option('avahi', with_name="enable", without_name="disable") + opt.samba_add_onoff_option('iconv') + opt.samba_add_onoff_option('acl-support') + opt.samba_add_onoff_option('dnsupdate') + opt.samba_add_onoff_option('syslog') + opt.samba_add_onoff_option('automount') + opt.samba_add_onoff_option('dmapi', default=None) # None means autodetection + opt.samba_add_onoff_option('fam', default=None) # None means autodetection + opt.samba_add_onoff_option('profiling-data', default=False) + opt.samba_add_onoff_option('libarchive', default=True) + + opt.samba_add_onoff_option('cluster-support', default=False) + + opt.samba_add_onoff_option('regedit', default=None) + + opt.samba_add_onoff_option('fake-kaserver', help=("Include AFS fake-kaserver support"), default=False) opt.add_option('--with-libcephfs', help=("Directory under which libcephfs is installed"), action="store", dest='libcephfs_dir', default=None) - opt.SAMBA3_ADD_OPTION('glusterfs', with_name="enable", without_name="disable", default=True) - opt.SAMBA3_ADD_OPTION('cephfs', with_name="enable", without_name="disable", default=True) + opt.samba_add_onoff_option('glusterfs', with_name="enable", without_name="disable", default=True) + opt.samba_add_onoff_option('cephfs', with_name="enable", without_name="disable", default=True) opt.add_option('--enable-vxfs', help=("enable support for VxFS (default=no)"), action="store_true", dest='enable_vxfs', default=False) - opt.SAMBA3_ADD_OPTION('spotlight', with_name="enable", without_name="disable", default=False) + opt.samba_add_onoff_option('spotlight', with_name="enable", without_name="disable", default=False) def configure(conf): - from samba_utils import TO_LIST - default_static_modules = [] default_shared_modules = [] required_static_modules = [] @@ -94,9 +95,11 @@ def configure(conf): conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True) # We crash without vfs_default - required_static_modules.extend(TO_LIST('vfs_default')) + # and vfs_not_implemented provides helper function + # for other modules + required_static_modules.extend(TO_LIST('vfs_default vfs_not_implemented')) - conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h netdb.h') + conf.CHECK_HEADERS('netdb.h') conf.CHECK_HEADERS('linux/falloc.h linux/ioctl.h') conf.CHECK_FUNCS('getcwd fchown chmod fchmod mknod') @@ -106,7 +109,7 @@ def configure(conf): conf.CHECK_FUNCS('innetgr') conf.CHECK_FUNCS('initgroups select poll rdchk getgrnam getgrent pathconf') conf.CHECK_FUNCS('setpriv setgidx setuidx setgroups syscall sysconf') - conf.CHECK_FUNCS('atexit grantpt posix_openpt fallocate posix_fallocate') + conf.CHECK_FUNCS('atexit grantpt posix_openpt fallocate') conf.CHECK_FUNCS('fseeko setluid') conf.CHECK_FUNCS('getpwnam', headers='sys/types.h pwd.h') conf.CHECK_FUNCS('fdopendir') @@ -119,7 +122,6 @@ def configure(conf): conf.CHECK_FUNCS('memalign posix_memalign hstrerror') conf.CHECK_FUNCS('shmget') conf.CHECK_FUNCS_IN('shm_open', 'rt', checklibc=True) - #FIXME: for some reason this one still fails conf.CHECK_FUNCS_IN('yp_get_default_domain', 'nsl') conf.CHECK_FUNCS_IN('dn_expand _dn_expand __dn_expand', 'resolv') conf.CHECK_FUNCS_IN('dn_expand', 'inet') @@ -168,11 +170,6 @@ main() { }''', 'HAVE_KERNEL_OPLOCKS_LINUX', addmain=False, execute=True, msg="Checking for Linux kernel oplocks") - # Check for IRIX kernel oplock types - conf.CHECK_CODE('oplock_stat_t t; t.os_state = OP_REVOKE; t.os_dev = 1; t.os_ino = 1;', - 'HAVE_KERNEL_OPLOCKS_IRIX', headers='fcntl.h', - msg="Checking for IRIX kernel oplock types") - # Check for kernel share modes conf.CHECK_CODE(''' #include @@ -219,12 +216,20 @@ main() { # None means autodetect, True/False means enable/disable conf.SET_TARGET_TYPE('archive', 'EMPTY') if Options.options.with_libarchive is not False: - libarchive_mandatory = Options.options.with_libarchive == True Logs.info("Checking for libarchive existence") if conf.CHECK_HEADERS('archive.h') and conf.CHECK_LIB('archive', shlib=True): conf.CHECK_FUNCS_IN('archive_read_support_filter_all archive_read_free', 'archive') - elif libarchive_mandatory: - conf.fatal('libarchive support requested, but not found') + else: + conf.fatal("libarchive support not found. " + "Try installing libarchive-dev or libarchive-devel. " + "Otherwise, use --without-libarchive to " + "build without libarchive support. " + "libarchive support is required for the smbclient " + "tar-file mode") + elif conf.CONFIG_GET('ENABLE_SELFTEST'): + raise Errors.WafError('libarchive library required for ' + '--enable-selftest') + # check for DMAPI libs if Options.options.with_dmapi == False: @@ -387,7 +392,7 @@ DNSServiceRegister _dup __dup _dup2 __dup2 endmntent execl _facl __facl _fchdir __fchdir fchmod fchown _fcntl __fcntl fcvt fcvtl fdatasync _fork __fork fseeko -fsetxattr _fstat __fstat fsync +_fstat __fstat fsync futimens futimes __fxstat getauthuid getcwd _getcwd __getcwd getdents __getdents getdirentries getgrent getgrnam getgrouplist getgrset getmntent getpagesize @@ -397,7 +402,7 @@ llseek _llseek __llseek _lseek __lseek _lstat __lstat lutimes __lxstat memalign mknod mlock mlockall munlock munlockall _open __open _opendir __opendir -pathconf poll posix_fallocate +pathconf poll posix_memalign pread _pread __pread pwrite _pwrite __pwrite rdchk _read __read _readdir __readdir @@ -551,29 +556,6 @@ return acl_get_perm_np(permset_d, perm); msg='Checking for openat', headers='fcntl.h') - if host_os.rfind('linux') > -1: - conf.CHECK_FUNCS_IN('io_submit', 'aio') - conf.CHECK_CODE(''' -struct io_event ioev; -struct iocb *ioc; -io_context_t ctx; -struct timespec ts; -int fd; -char *buf; -fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); -io_queue_init(128,&ctx); -io_prep_pwrite(ioc, 1, buf, 1, 0); -io_prep_pread(ioc, 1, buf, 1, 0); -io_set_eventfd(ioc, fd); -io_set_callback(ioc, (io_callback_t)(0)); -io_submit(ctx, 1, &ioc); -io_getevents(ctx, 1, 1, &ioev, &ts); -''', - 'HAVE_LINUX_KERNEL_AIO', - msg='Checking for linux kernel asynchronous io support', - headers='unistd.h stdlib.h sys/types.h fcntl.h sys/eventfd.h libaio.h', - lib='aio') - conf.CHECK_CODE(''' struct msghdr msg; union { @@ -616,24 +598,8 @@ msg.msg_accrightslen = sizeof(fd); headers='unistd.h sys/types.h dirent.h', define='HAVE_DIRENT_D_OFF') - conf.CHECK_FUNCS('setnetgrent getnetgrent endnetgrent') - if conf.CHECK_CFLAGS('-Werror-implicit-function-declaration'): - netgrent_cflags = '-Werror-implicit-function-declaration' - else: - netgrent_cflags = '' - conf.CHECK_CODE('setnetgrent("foo")', 'HAVE_SETNETGRENT_PROTOTYPE', - msg="Checking for setnetgrent prototype", - headers='netdb.h netgroup.h', - cflags=netgrent_cflags) - conf.CHECK_CODE('getnetgrent', 'HAVE_GETNETGRENT_PROTOTYPE', - msg="Checking for getnetgrent prototype", - headers='netdb.h netgroup.h', - cflags=netgrent_cflags) - conf.CHECK_CODE('endnetgrent', 'HAVE_ENDNETGRENT_PROTOTYPE', - msg="Checking for endnetgrent prototype", - headers='netdb.h netgroup.h', - cflags=netgrent_cflags) - + if (conf.CONFIG_SET('HAVE_YP_GET_DEFAULT_DOMAIN')): + conf.DEFINE('HAVE_NETGROUP', '1') # Look for CUPS if Options.options.with_cups: @@ -843,6 +809,8 @@ msg.msg_accrightslen = sizeof(fd); define='HAVE_UT_UT_EXIT') conf.CHECK_STRUCTURE_MEMBER('struct utmpx', 'ut_syslen', headers='utmpx.h', define='HAVE_UX_UT_SYSLEN') + conf.CHECK_STRUCTURE_MEMBER('struct utmpx', 'ut_host', headers='utmpx.h', + define='HAVE_UX_UT_HOST') conf.CHECK_CODE('struct utmp utarg; struct utmp *utreturn; utreturn = pututline(&utarg);', 'PUTUTLINE_RETURNS_UTMP', headers='utmp.h', msg="Checking whether pututline returns pointer") @@ -996,23 +964,23 @@ syscall(SYS_setgroups32, 0, NULL); if (conf.CONFIG_SET('USE_LINUX_32BIT_SYSCALLS')): seteuid = conf.CHECK_CODE(''' #define AUTOCONF_TEST 1 - #define USE_LINUX_THREAD_CREDENTIALS 1 + #define HAVE_LINUX_THREAD_CREDENTIALS 1 #define USE_LINUX_32BIT_SYSCALLS 1 #include "../lib/util/setid.c" #include "./lib/util_sec.c" ''', - 'USE_LINUX_THREAD_CREDENTIALS', + 'HAVE_LINUX_THREAD_CREDENTIALS', addmain=False, execute=True, msg="Checking whether we can use Linux thread-specific credentials with 32-bit system calls") else: seteuid = conf.CHECK_CODE(''' #define AUTOCONF_TEST 1 - #define USE_LINUX_THREAD_CREDENTIALS 1 + #define HAVE_LINUX_THREAD_CREDENTIALS 1 #include "../lib/util/setid.c" #include "./lib/util_sec.c" ''', - 'USE_LINUX_THREAD_CREDENTIALS', + 'HAVE_LINUX_THREAD_CREDENTIALS', addmain=False, execute=True, msg="Checking whether we can use Linux thread-specific credentials") @@ -1066,7 +1034,7 @@ syscall(SYS_setgroups32, 0, NULL); Logs.warn("--with-dnsupdate=yes but gssapi support not sufficient") else: conf.DEFINE('WITH_DNS_UPDATES', 1) - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') + # valgrind.h or valgrind/valgrind.h is checked in lib/replace/wscript if Options.options.developer: if conf.CONFIG_SET('HAVE_VALGRIND_H') or conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'): conf.DEFINE('VALGRIND', '1') @@ -1154,19 +1122,6 @@ err: execute=True, msg="Checking whether fcntl lock supports open file description locks") -# glibc up to 2.3.6 had dangerously broken posix_fallocate(). DON'T USE IT. - if not conf.CHECK_CODE(''' -#define _XOPEN_SOURCE 600 -#include -#if defined(__GLIBC__) && ((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 4)) -#error probably broken posix_fallocate -#endif -''', - '_HAVE_UNBROKEN_POSIX_FALLOCATE', - msg='Checking for broken posix_fallocate'): - conf.DEFINE('HAVE_BROKEN_POSIX_FALLOCATE', '1') - - conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtim.tv_nsec', define='HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC') # Linux, Solaris conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtimensec', @@ -1297,7 +1252,9 @@ main() { addmain=False, execute=True) - if Options.options.with_sendfile_support: + conf.SET_TARGET_TYPE('sendfile', 'EMPTY') + conf.CHECK_LIB('sendfile') + if not Options.options.with_sendfile_support == False: if (host_os.rfind('linux') > -1) or (host_os.rfind('gnu') > -1) or (host_os.rfind('k*bsd*-gnu') > -1) or (host_os.rfind('kopensolaris*-gnu') > -1): conf.CHECK_CODE(''' int tofd, fromfd; @@ -1312,7 +1269,6 @@ main() { if conf.CONFIG_SET('_HAVE_SENDFILE'): conf.DEFINE('HAVE_SENDFILE', '1') conf.DEFINE('LINUX_SENDFILE_API', '1') - conf.DEFINE('WITH_SENDFILE', '1') elif (host_os.rfind('freebsd') > -1) or (host_os.rfind('dragonfly') > -1): conf.CHECK_CODE(''' #include @@ -1336,7 +1292,6 @@ main() { if conf.CONFIG_SET('_HAVE_SENDFILE'): conf.DEFINE('HAVE_SENDFILE', '1') conf.DEFINE('FREEBSD_SENDFILE_API', '1') - conf.DEFINE('WITH_SENDFILE', '1') elif (host_os.rfind('darwin') > -1): conf.CHECK_CODE(''' #include @@ -1359,7 +1314,6 @@ main() { if conf.CONFIG_SET('_HAVE_SENDFILE'): conf.DEFINE('HAVE_SENDFILE', '1') conf.DEFINE('DARWIN_SENDFILE_API', '1') - conf.DEFINE('WITH_SENDFILE', '1') elif (host_os.rfind('hpux') > -1) or (host_os.rfind('osf') > -1): conf.CHECK_CODE(''' #include @@ -1378,9 +1332,8 @@ main() { if conf.CONFIG_SET('_HAVE_SENDFILE'): conf.DEFINE('HAVE_SENDFILE', '1') conf.DEFINE('HPUX_SENDFILE_API', '1') - conf.DEFINE('WITH_SENDFILE', '1') - elif (host_os.rfind('solaris') > -1): - conf.CHECK_FUNCS_IN('sendfile', 'sendfilev') + elif (host_os.rfind('sunos') > -1): + conf.CHECK_FUNCS_IN('sendfilev', 'sendfile') conf.CHECK_CODE(''' #include , int sfvcnt; @@ -1400,11 +1353,11 @@ main() { nwritten = sendfilev(tofd, vec, sfvcnt, &xferred); ''', '_HAVE_SENDFILEV', - msg='Checking for solaris sendfilev support') + msg='Checking for solaris sendfilev support', + lib='sendfile') if conf.CONFIG_SET('_HAVE_SENDFILEV'): conf.DEFINE('HAVE_SENDFILEV', '1') conf.DEFINE('SOLARIS_SENDFILE_API', '1') - conf.DEFINE('WITH_SENDFILE', '1') elif (host_os.rfind('aix') > -1): conf.CHECK_CODE(''' #include @@ -1426,8 +1379,9 @@ main() { if conf.CONFIG_SET('_HAVE_SENDFILE'): conf.DEFINE('HAVE_SENDFILE', '1') conf.DEFINE('AIX_SENDFILE_API', '1') - conf.DEFINE('WITH_SENDFILE', '1') + if Options.options.with_sendfile_support == True and not conf.CONFIG_SET('HAVE_SENDFILE'): + conf.fatal('sendfile support not found but it was requested !') # Check for getcwd allowing a NULL arg. conf.CHECK_CODE(''' #include @@ -1444,13 +1398,15 @@ main() { conf.CHECK_FUNCS_IN('getspnam', 'sec') legacy_quota_libs = '' - if Options.options.with_quotas: + if not Options.options.with_quotas == False: # For quotas on Veritas VxFS filesystems conf.CHECK_HEADERS('sys/fs/vx_quota.h') # For sys/quota.h and linux/quota.h conf.CHECK_HEADERS('sys/quota.h') # For quotas on BSD systems conf.CHECK_HEADERS('ufs/ufs/quota.h') + # For quotas on AIX systems + conf.CHECK_HEADERS('jfs/quota.h') # For quotas on Linux XFS filesystems if conf.CHECK_HEADERS('xfs/xqm.h'): conf.DEFINE('HAVE_XFS_QUOTAS', '1') @@ -1477,11 +1433,23 @@ main() { #darwin style quota bytecount conf.CHECK_STRUCTURE_MEMBER('struct dqblk', 'dqb_curbytes', define='HAVE_STRUCT_DQBLK_DQB_CURBYTES', headers='sys/quota.h') - if conf.CHECK_HEADERS('rpcsvc/rquota.h'): - conf.DEFINE('HAVE_NFS_QUOTAS', '1') + if conf.CHECK_HEADERS('rpcsvc/rquota.h', lib='tirpc'): + # Optional structure member conf.CHECK_STRUCTURE_MEMBER('struct getquota_rslt', 'getquota_rslt_u', define='HAVE_GETQUOTA_RSLT_GETQUOTA_RSLT_U', - headers='rpcsvc/rquota.h') + headers='rpcsvc/rquota.h', + lib='tirpc') + + # Required function for NFS quote support + conf.CHECK_CODE(''' + clnt_create("", RQUOTAPROG, RQUOTAVERS, "udp"); + ''', + headers="rpc/rpc.h rpc/types.h rpcsvc/rquota.h rpc/nettype.h rpc/xdr.h", + define='HAVE_NFS_QUOTAS', + msg='checking for clnt_create()', + execute=True, + local_include=False, + lib='tirpc') if (host_os.rfind('linux') > -1): conf.DEFINE('HAVE_QUOTACTL_LINUX', '1') @@ -1508,15 +1476,6 @@ main() { execute=True, addmain=False) - conf.CHECK_CODE(''' - clnt_create("", RQUOTAPROG, RQUOTAVERS, "udp"); -''', - headers="rpc/rpc.h rpc/types.h rpcsvc/rquota.h rpc/nettype.h rpc/xdr.h", - define='HAVE_NFS_QUOTAS', - msg='for NFS QUOTAS', - execute=True, - local_include=False) - if conf.CONFIG_SET('HAVE_QUOTACTL_LINUX') or \ conf.CONFIG_SET('HAVE_QUOTACTL_4A') or \ conf.CONFIG_SET('HAVE_QUOTACTL_4B') or \ @@ -1547,6 +1506,14 @@ main() { legacy_quota_libs = '' conf.env['legacy_quota_libs'] = legacy_quota_libs + if Options.options.with_quotas == True and not conf.CONFIG_SET('WITH_QUOTAS'): + conf.fatal('quota support not found but it was equested !') + + conf.CHECK_CODE('(void)unshare(CLONE_FS);', + headers='sched.h', + define='HAVE_UNSHARE_CLONE_FS', + msg='for Linux unshare(CLONE_FS)') + # # cluster support (CTDB) # @@ -1571,15 +1538,22 @@ main() { conf.CHECK_DECLS('FS_IOC_GETFLAGS FS_COMPR_FL', headers='linux/fs.h')): conf.DEFINE('HAVE_LINUX_IOCTL', '1') - conf.env['CCFLAGS_CEPHFS'] = "-D_FILE_OFFSET_BITS=64" + 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' - if conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and conf.CHECK_LIB('cephfs', shlib=True) and Options.options.with_cephfs: + if (Options.options.with_cephfs and + conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and + 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', headers='cephfs/libcephfs.h'): + if conf.CHECK_FUNCS_IN('ceph_statx', 'cephfs ceph-common', + headers='cephfs/libcephfs.h'): conf.DEFINE('HAVE_CEPH_STATX', '1') else: Logs.warn("ceph support disabled due to --without-acl-support") @@ -1588,10 +1562,10 @@ main() { if Options.options.with_glusterfs: conf.CHECK_CFG(package='glusterfs-api', args='"glusterfs-api >= 4" --cflags --libs', msg='Checking for glusterfs-api >= 4', uselib_store="GFAPI") - conf.CHECK_HEADERS('api/glfs.h', lib='gfapi') + conf.CHECK_HEADERS('glusterfs/api/glfs.h', lib='gfapi') conf.CHECK_LIB('gfapi', shlib=True) - if conf.CONFIG_SET('HAVE_API_GLFS_H'): + if conf.CONFIG_SET('HAVE_GLUSTERFS_API_GLFS_H'): if Options.options.with_acl_support: conf.DEFINE('HAVE_GLUSTERFS', '1') else: @@ -1599,6 +1573,13 @@ main() { conf.undefine('HAVE_GLUSTERFS') else: conf.undefine('HAVE_GLUSTERFS') + + conf.CHECK_CFG(package='glusterfs-api', args='"glusterfs-api >= 6" --cflags --libs', + msg='Checking for glusterfs-api >= 6', + uselib_store="GFAPI_VER_6") + conf.CHECK_CFG(package='glusterfs-api', args='"glusterfs-api >= 7.6" --cflags --libs', + msg='Checking for glusterfs-api >= 7.6', + uselib_store="GFAPI_VER_7_6") else: conf.SET_TARGET_TYPE('gfapi', 'EMPTY') conf.undefine('HAVE_GLUSTERFS') @@ -1646,16 +1627,16 @@ main() { if Options.options.with_spotlight: Logs.info("Requested Spotlight support, checking for bison") - bison.detect(conf) + bison.configure(conf) if not conf.env['BISON']: conf.fatal("Spotlight support requested but bison missing") conf.CHECK_COMMAND('%s --version | head -n1' % conf.env['BISON'], msg='Using bison version', define=None, on_target=False) Logs.info("Requested Spotlight support, checking for flex") - flex.detect(conf) + flex.configure(conf) if not conf.env['FLEX']: conf.fatal("Spotlight support requested but flex missing") conf.CHECK_COMMAND('%s --version' % conf.env['FLEX'], msg='Using flex version', define=None, on_target=False) - versions = ['1.0', '0.16', '0.14'] + versions = ['2.0', '1.0', '0.16', '0.14'] for version in versions: testlib = 'tracker-sparql-' + version if conf.CHECK_CFG(package=testlib, @@ -1672,7 +1653,12 @@ main() { Logs.info("building with Spotlight support") default_static_modules.extend(TO_LIST('rpc_mdssvc_module')) - forced_static_modules.extend(TO_LIST('auth_domain auth_builtin auth_sam auth_winbind')) + conf.CHECK_HEADERS('rpc/xdr.h', lib='tirpc') + + if conf.CHECK_FUNCS_IN('nscd_flush_cache', 'nscd', headers='libnscd.h'): + conf.DEFINE('HAVE_NSCD_FLUSH_CACHE', '1') + + forced_static_modules.extend(TO_LIST('auth_builtin auth_sam auth_winbind')) default_static_modules.extend(TO_LIST('''pdb_smbpasswd pdb_tdbsam auth_unix nss_info_template idmap_tdb idmap_passdb @@ -1687,7 +1673,8 @@ main() { vfs_preopen vfs_catia vfs_media_harmony vfs_unityed_media vfs_fruit vfs_shell_snap vfs_commit vfs_worm vfs_crossrename vfs_linux_xfs_sgid - vfs_time_audit vfs_offline + vfs_time_audit vfs_offline vfs_virusfilter + vfs_glusterfs_fuse ''')) default_shared_modules.extend(TO_LIST('auth_script idmap_tdb2 idmap_script')) # these have broken dependencies @@ -1703,6 +1690,8 @@ main() { if Options.options.enable_selftest or Options.options.developer: default_shared_modules.extend(TO_LIST('vfs_fake_acls vfs_nfs4acl_xattr')) + default_shared_modules.extend(TO_LIST('vfs_error_inject')) + default_shared_modules.extend(TO_LIST('vfs_delay_inject')) if conf.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'): default_static_modules.extend(TO_LIST('pdb_samba_dsdb auth_samba4 vfs_dfs_samba4')) @@ -1723,9 +1712,6 @@ main() { if Options.options.with_pthreadpool: default_shared_modules.extend(TO_LIST('vfs_aio_pthread')) - if conf.CONFIG_SET('HAVE_LINUX_KERNEL_AIO'): - default_shared_modules.extend(TO_LIST('vfs_aio_linux')) - if conf.CONFIG_SET('HAVE_LDAP'): default_static_modules.extend(TO_LIST('pdb_ldapsam idmap_ldap')) @@ -1797,13 +1783,13 @@ main() { if m.startswith('!'): m = m[1:] if m in required_static_modules: - raise Utils.WafError('These modules are REQUIRED as static modules: %s' % + raise Errors.WafError('These modules are REQUIRED as static modules: %s' % ' '.join(required_static_modules)) if m in final_static_modules: final_static_modules.remove(m) continue if m in forced_shared_modules: - raise Utils.WafError('These modules MUST be configured as shared modules: %s' % + raise Errors.WafError('These modules MUST be configured as shared modules: %s' % ' '.join(forced_shared_modules)) if m in final_shared_modules: final_shared_modules.remove(m) @@ -1818,10 +1804,10 @@ main() { final_shared_modules.remove(m) continue if m in required_static_modules: - raise Utils.WafError('These modules are REQUIRED as static modules: %s' % + raise Errors.WafError('These modules are REQUIRED as static modules: %s' % ' '.join(required_static_modules)) if m in forced_static_modules: - raise Utils.WafError('These module MUST be configured as static modules: %s' % + raise Errors.WafError('These module MUST be configured as static modules: %s' % ' '.join(forced_static_modules)) if m in final_static_modules: final_static_modules.remove(m)