Default autostart to "none"
Unless overriden during configure stage, autostart now defaults to
none.
This is safer approach for packagers wanting to provide both
jackdbus and jackd executables (via two distinct packages).
See also commit 35f4101850
This commit is contained in:
parent
58d33170b2
commit
e8ab33123f
9
wscript
9
wscript
|
@ -99,8 +99,8 @@ def options(opt):
|
|||
opt.add_option(
|
||||
'--autostart',
|
||||
type='string',
|
||||
default='dbus',
|
||||
help='Autostart method. Possible values: "default", "classic", "dbus", "none"',
|
||||
default='default',
|
||||
help='Autostart method. Possible values: "none", "dbus", "classic", "default" (none)',
|
||||
)
|
||||
opt.add_option('--profile', action='store_true', default=False, help='Build with engine profiling')
|
||||
opt.add_option('--clients', default=256, type='int', dest='clients', help='Maximum number of JACK clients')
|
||||
|
@ -408,10 +408,7 @@ def configure(conf):
|
|||
conf.fatal('Invalid autostart value "' + Options.options.autostart + '"')
|
||||
|
||||
if Options.options.autostart == 'default':
|
||||
if conf.env['BUILD_JACKD']:
|
||||
conf.env['AUTOSTART_METHOD'] = 'classic'
|
||||
else:
|
||||
conf.env['AUTOSTART_METHOD'] = 'dbus'
|
||||
conf.env['AUTOSTART_METHOD'] = 'none'
|
||||
else:
|
||||
conf.env['AUTOSTART_METHOD'] = Options.options.autostart
|
||||
|
||||
|
|
Loading…
Reference in New Issue