67 lines
3.1 KiB
Text
67 lines
3.1 KiB
Text
--- source3/wscript.orig 2014-12-20 15:07:55.000000000 +0000
|
|
+++ source3/wscript 2015-06-08 18:12:58.068891397 +0000
|
|
@@ -34,6 +34,7 @@
|
|
opt.SAMBA3_ADD_OPTION('utmp')
|
|
opt.SAMBA3_ADD_OPTION('pthreadpool', with_name="enable", without_name="disable", default=True)
|
|
opt.SAMBA3_ADD_OPTION('avahi', with_name="enable", without_name="disable")
|
|
+ opt.SAMBA3_ADD_OPTION('dnssd', with_name="enable", without_name="disable")
|
|
opt.SAMBA3_ADD_OPTION('iconv')
|
|
opt.SAMBA3_ADD_OPTION('acl-support')
|
|
opt.SAMBA3_ADD_OPTION('dnsupdate')
|
|
@@ -342,7 +343,9 @@
|
|
|
|
# Check if the compiler will optimize out functions
|
|
conf.CHECK_CODE('''
|
|
-if (0) {
|
|
+char s = "string";
|
|
+int len = 6;
|
|
+if (sizeof(s) != len && sizeof(s) != sizeof(char *)) {
|
|
this_function_does_not_exist();
|
|
} else {
|
|
return 1;
|
|
@@ -527,7 +530,7 @@
|
|
conf.CHECK_CODE('struct aiocb a; return aio_return(&a);', 'HAVE_AIO_RETURN', msg='Checking for aio_return', headers='aio.h', lib='aio rt')
|
|
conf.CHECK_CODE('struct aiocb a; return aio_error(&a);', 'HAVE_AIO_ERROR', msg='Checking for aio_error', headers='aio.h', lib='aio rt')
|
|
conf.CHECK_CODE('struct aiocb a; return aio_cancel(1, &a);', 'HAVE_AIO_CANCEL', msg='Checking for aio_cancel', headers='aio.h', lib='aio rt')
|
|
- conf.CHECK_CODE('const struct aiocb * const a[1]; struct timespec t; return aio_suspend(&a, 1, &t);', 'HAVE_AIO_SUSPEND', msg='Checking for aio_suspend', headers='aio.h', lib='aio rt')
|
|
+ conf.CHECK_CODE('const struct aiocb * const a[1]; struct timespec t; return aio_suspend(a, 1, &t);', 'HAVE_AIO_SUSPEND', msg='Checking for aio_suspend', headers='aio.h', lib='aio rt')
|
|
if not conf.CONFIG_SET('HAVE_AIO'):
|
|
conf.DEFINE('HAVE_NO_AIO', '1')
|
|
else:
|
|
@@ -848,6 +851,17 @@
|
|
conf.SET_TARGET_TYPE('avahi-common', 'EMPTY')
|
|
conf.SET_TARGET_TYPE('avahi-client', 'EMPTY')
|
|
|
|
+ if Options.options.with_dnssd:
|
|
+ conf.env.with_dnssd = True
|
|
+ if not conf.CHECK_HEADERS('dns_sd.h'):
|
|
+ conf.env.with_dnssd = False
|
|
+ if not conf.CHECK_FUNCS_IN('DNSServiceRegister', 'dns_sd'):
|
|
+ conf.env.with_dnssd = False
|
|
+ if conf.env.with_dnssd:
|
|
+ conf.DEFINE('WITH_DNSSD_SUPPORT', 1)
|
|
+ else:
|
|
+ conf.SET_TARGET_TYPE('dns_sd', 'EMPTY')
|
|
+
|
|
if Options.options.with_iconv:
|
|
conf.env.with_iconv = True
|
|
if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'):
|
|
@@ -1603,7 +1617,7 @@
|
|
default_static_modules.extend(TO_LIST('charset_macosxfs'))
|
|
|
|
if conf.CONFIG_SET('HAVE_GPFS'):
|
|
- default_shared_modules.extend(TO_LIST('vfs_gpfs'))
|
|
+ default_shared_modules.extend(TO_LIST('vfs_gpfs'))
|
|
|
|
if conf.CONFIG_SET('HAVE_LINUX_IOCTL'):
|
|
default_shared_modules.extend(TO_LIST('vfs_btrfs'))
|
|
@@ -1620,9 +1634,6 @@
|
|
if conf.CONFIG_SET('HAVE_VXFS'):
|
|
default_shared_modules.extend(TO_LIST('vfs_vxfs'))
|
|
|
|
- if conf.CONFIG_SET('HAVE_DBUS'):
|
|
- default_shared_modules.extend(TO_LIST('vfs_snapper'))
|
|
-
|
|
explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',')
|
|
explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',')
|
|
|