From 92aca32652e1cba4c7fb00e4889fe4b8f5d47f11 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Sun, 23 Jan 2022 22:46:10 +0100 Subject: [PATCH] wscript: stop loading misc where nothing is using it It is apparently only used in gtk2_ardour/wscript - and it seems to be enough to load it in configure(), even though it is used in build(). --- gtk2_ardour/wscript | 2 +- headless/wscript | 2 +- libs/fst/wscript | 2 -- luasession/wscript | 1 - session_utils/wscript | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index fed019a5e4..1d552f7303 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -434,7 +434,7 @@ def options(opt): pass def configure(conf): - conf.load('misc') + conf.load('misc') # make 'command-output' available # TODO: Insert a sanity check for on OS X to ensure CoreAudio is present diff --git a/headless/wscript b/headless/wscript index 8fce49f78b..32d2e00036 100644 --- a/headless/wscript +++ b/headless/wscript @@ -11,7 +11,7 @@ def options(opt): pass def configure(conf): - conf.load('misc') + pass def build(bld): # just the normal executable version of the GTK GUI diff --git a/libs/fst/wscript b/libs/fst/wscript index bad18f06c9..bed56ec731 100644 --- a/libs/fst/wscript +++ b/libs/fst/wscript @@ -10,8 +10,6 @@ def options(opt): pass def configure(conf): - conf.load('misc') - if conf.env['WINDOWS_VST_SUPPORT'] == True: conf.check(compiler='cxx', lib='gdi32', mandatory=True, uselib_store='GDI32') diff --git a/luasession/wscript b/luasession/wscript index 76ce13d7d7..5e85a9a6fd 100644 --- a/luasession/wscript +++ b/luasession/wscript @@ -7,7 +7,6 @@ def options(opt): pass def configure(conf): - conf.load('misc') conf.check_cc( header_name='stdio.h readline/readline.h', lib='readline', diff --git a/session_utils/wscript b/session_utils/wscript index a789516d1b..d8a3ac491a 100644 --- a/session_utils/wscript +++ b/session_utils/wscript @@ -14,7 +14,6 @@ def configure(conf): return autowaf.display_msg(conf, 'build session-utils', 'yes') - conf.load('misc') def build_ardour_util(bld, util): pgmprefix = bld.env['PROGRAM_NAME'].lower() + str(bld.env['MAJOR'])