951c1f5d1c
The offical GNOME 3.28 release notes can be found at https://help.gnome.org/misc/release-notes/3.28/ Thanks to Antoine Brodin for running the exp-runs. PR: 229761
47 lines
2.1 KiB
Text
47 lines
2.1 KiB
Text
--- source3/wscript.orig 2018-04-17 09:35:02.000000000 +0200
|
|
+++ source3/wscript 2018-07-11 22:55:06.353523000 +0200
|
|
@@ -47,6 +47,7 @@ def set_options(opt):
|
|
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('dnssd', with_name="enable", without_name="disable")
|
|
opt.SAMBA3_ADD_OPTION('iconv')
|
|
opt.SAMBA3_ADD_OPTION('acl-support')
|
|
opt.SAMBA3_ADD_OPTION('dnsupdate')
|
|
@@ -872,6 +873,17 @@ msg.msg_accrightslen = sizeof(fd);
|
|
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'):
|
|
@@ -1669,7 +1681,7 @@ main() {
|
|
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,
|
|
@@ -1762,9 +1774,6 @@ main() {
|
|
|
|
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=',')
|