wscript: drop configure statements already present in the top level w…

…script Avoid repeated pointless configure messages like: Checking for 'g++' (C++ compiler!) : /usr/lib64/ccache/g++ Checking for 'gcc' (C compiler) : /usr/lib64/ccache/gcc
kiilerix · Jan 22, 2022 · 8bb9109 · 8bb9109
1 parent 7f6ce9a
commit 8bb9109
Show file tree

Hide file tree

Showing 68 changed files with 31 additions and 112 deletions.
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
@@ -430,8 +430,6 @@ def options(opt):
 
 def configure(conf):
     conf.load('misc')
-    conf.load('compiler_cxx')
-    autowaf.configure(conf)
 
     # TODO: Insert a sanity check for on OS X to ensure CoreAudio is present
 

diff --git a/headless/wscript b/headless/wscript
@@ -23,8 +23,6 @@ def options(opt):
 
 def configure(conf):
     conf.load('misc')
-    conf.load('compiler_cxx')
-    autowaf.configure(conf)
 
 
 def build(bld):

diff --git a/libs/appleutility/wscript b/libs/appleutility/wscript
@@ -25,7 +25,6 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure(conf)
     if conf.env['build_target'] in ['panther', 'tiger', 'leopard'] or (Options.options.ppc and conf.env['build_target'] == 'snowleopard'):
         conf.env.append_value ('CFLAGS', '-DCOREAUDIO105')
         conf.env.append_value ('CXXFLAGS', '-DCOREAUDIO105')

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
@@ -295,10 +295,8 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    conf.load('compiler_cxx')
     conf.load('gas')
     # we don't use hard-coded micro versions with ardour, so hard code it to zero
-    autowaf.configure(conf)
     autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
                       atleast_version='0.3.2')
     autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO4',

diff --git a/libs/ardouralsautil/wscript b/libs/ardouralsautil/wscript
@@ -16,7 +16,6 @@ def options(opt):
 
 
 def configure(conf):
-    autowaf.configure(conf)
     if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw':
         autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
         autowaf.check_pkg(conf, 'dbus-1', uselib_store='DBUS', mandatory = False)

diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript
@@ -26,8 +26,6 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    conf.load('compiler_cxx')
-    autowaf.configure(conf)
 
     autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
     autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0', mandatory=False)

diff --git a/libs/auscan/wscript b/libs/auscan/wscript
@@ -15,8 +15,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    conf.load('compiler_cxx')
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     if bld.is_defined('AUDIOUNIT_SUPPORT'):

diff --git a/libs/backends/alsa/wscript b/libs/backends/alsa/wscript
@@ -14,7 +14,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')

diff --git a/libs/backends/coreaudio/wscript b/libs/backends/coreaudio/wscript
@@ -15,7 +15,6 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure(conf)
     if Options.options.ppc:
         conf.env['build_arch'] = "ppc"
 

diff --git a/libs/backends/dummy/wscript b/libs/backends/dummy/wscript
@@ -14,7 +14,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')

diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript
@@ -25,7 +25,6 @@ def configure(conf):
     if Options.options.dist_target == 'mingw':
         autowaf.check_pkg(conf, 'portaudio-2.0', uselib_store='PORTAUDIO',
                           atleast_version='19')
-    autowaf.configure(conf)
 
     if Options.options.libjack_link == 'auto':
         if Options.options.dist_target == 'mingw' or sys.platform == 'darwin':

diff --git a/libs/backends/portaudio/wscript b/libs/backends/portaudio/wscript
@@ -15,7 +15,6 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure(conf)
     autowaf.check_pkg(conf, 'portaudio-2.0', uselib_store='PORTAUDIO', atleast_version='19')
     conf.check(header_name='pa_asio.h', define_name='WITH_ASIO', mandatory=False)
 

diff --git a/libs/backends/pulseaudio/wscript b/libs/backends/pulseaudio/wscript
@@ -14,7 +14,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')

diff --git a/libs/backends/wscript b/libs/backends/wscript
@@ -18,7 +18,6 @@ def sub_config_and_use(conf, name, has_objects = True):
 
 def configure(conf):
     autowaf.set_recursive()
-    autowaf.configure(conf)
 
     backends = conf.env['BACKENDS']
     for i in backends:

diff --git a/libs/canvas/wscript b/libs/canvas/wscript
@@ -71,8 +71,6 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    conf.load ('compiler_cxx')
-    autowaf.configure(conf)
     autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4')
 
 def build(bld):

diff --git a/libs/clearlooks-newer/wscript b/libs/clearlooks-newer/wscript
@@ -12,8 +12,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    conf.load('compiler_c')
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     obj = bld(features = 'c cshlib')

diff --git a/libs/evoral/wscript b/libs/evoral/wscript
@@ -34,9 +34,6 @@ def options(opt):
                    help='Build internal libs as shared libraries')
 
 def configure(conf):
-    conf.load('compiler_c')
-    conf.load('compiler_cxx')
-    autowaf.configure(conf)
     #autowaf.display_header('Evoral Configuration')
 
     autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)

diff --git a/libs/fluidsynth/wscript b/libs/fluidsynth/wscript
@@ -25,9 +25,6 @@ def options(opt):
 def configure(conf):
     if conf.is_defined('USE_EXTERNAL_LIBS'):
         autowaf.check_pkg(conf, 'fluidsynth', uselib_store='LIBFLUIDSYNTH', atleast_version=LIBFLUIDSYNTH_VERSION, mandatory=True)
-    else:
-        conf.load('compiler_c')
-        autowaf.configure(conf)
 
 def build(bld):
     if bld.is_defined('USE_EXTERNAL_LIBS'):

diff --git a/libs/fst/wscript b/libs/fst/wscript
@@ -21,8 +21,6 @@ def options(opt):
 
 def configure(conf):
     conf.load('misc')
-    conf.load('compiler_cxx')
-    autowaf.configure(conf)
 
     if conf.env['WINDOWS_VST_SUPPORT'] == True:
         conf.check(compiler='cxx', lib='gdi32', mandatory=True, uselib_store='GDI32')

diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
@@ -62,8 +62,6 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    conf.load('compiler_cxx')
-    autowaf.configure(conf)
     autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.8')
     autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.12.1')
 

diff --git a/libs/hidapi/wscript b/libs/hidapi/wscript
@@ -33,8 +33,6 @@ def configure(conf):
                 conf.define ('HAVE_HIDAPI', 1)
         else:
             print ("hidapi is not yet available for the given system")
-        conf.load('compiler_c')
-        autowaf.configure(conf)
 
 def build(bld):
     if bld.is_defined('USE_EXTERNAL_LIBS'):

diff --git a/libs/libltc/wscript b/libs/libltc/wscript
@@ -31,9 +31,6 @@ def options(opt):
 def configure(conf):
     if conf.is_defined('USE_EXTERNAL_LIBS'):
         autowaf.check_pkg(conf, 'ltc', uselib_store='LIBLTC', atleast_version=LIBLTC_LIB_VERSION, mandatory=True)
-    else:
-        conf.load('compiler_c')
-        autowaf.configure(conf)
 
 def build(bld):
     if bld.is_defined('USE_EXTERNAL_LIBS'):

diff --git a/libs/lua/wscript b/libs/lua/wscript
@@ -17,8 +17,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    conf.load('compiler_c')
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     obj=bld.stlib (source   = ['lua.cc', 'luastate.cc'],

diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
@@ -44,8 +44,6 @@ def options(opt):
                     help="Build unit tests")
 
 def configure(conf):
-    conf.load('compiler_cxx')
-    autowaf.configure(conf)
     autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
     autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
     autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')

diff --git a/libs/panners/1in2out/wscript b/libs/panners/1in2out/wscript
@@ -10,7 +10,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')

diff --git a/libs/panners/2in2out/wscript b/libs/panners/2in2out/wscript
@@ -10,7 +10,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')

diff --git a/libs/panners/stereobalance/wscript b/libs/panners/stereobalance/wscript
@@ -10,7 +10,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')

diff --git a/libs/panners/vbap/wscript b/libs/panners/vbap/wscript
@@ -10,7 +10,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')

diff --git a/libs/panners/wscript b/libs/panners/wscript
@@ -18,7 +18,6 @@ def sub_config_and_use(conf, name, has_objects = True):
 
 def configure(conf):
     autowaf.set_recursive()
-    autowaf.configure(conf)
 
     panners = [ '2in2out', '1in2out', 'vbap', 'stereobalance' ]
 

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
@@ -102,8 +102,6 @@ def options(opt):
                    help='Build internal libs as shared libraries')
 
 def configure(conf):
-    conf.load('compiler_cxx')
-    autowaf.configure(conf)
     autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
     autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
     autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0', mandatory=True)

diff --git a/libs/plugins/a-comp.lv2/wscript b/libs/plugins/a-comp.lv2/wscript
@@ -13,8 +13,6 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    conf.load('compiler_c')
-    autowaf.configure(conf)
     autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
                       uselib_store='LV2_1_0_0')
     autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0')

diff --git a/libs/plugins/a-delay.lv2/wscript b/libs/plugins/a-delay.lv2/wscript
@@ -13,8 +13,6 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    conf.load('compiler_c')
-    autowaf.configure(conf)
     autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
                       uselib_store='LV2_1_0_0')
     autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0') 

diff --git a/libs/plugins/a-eq.lv2/wscript b/libs/plugins/a-eq.lv2/wscript
@@ -13,8 +13,6 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    conf.load('compiler_c')
-    autowaf.configure(conf)
     autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
                       uselib_store='LV2_1_0_0')
     autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0') 

diff --git a/libs/plugins/a-exp.lv2/wscript b/libs/plugins/a-exp.lv2/wscript
@@ -13,8 +13,6 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    conf.load('compiler_c')
-    autowaf.configure(conf)
     autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
                       uselib_store='LV2_1_0_0')
     autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0')

diff --git a/libs/plugins/a-fluidsynth.lv2/wscript b/libs/plugins/a-fluidsynth.lv2/wscript
@@ -13,8 +13,6 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    conf.load('compiler_c')
-    autowaf.configure(conf)
     autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
                       uselib_store='LV2_1_0_0')
 

diff --git a/libs/plugins/a-reverb.lv2/wscript b/libs/plugins/a-reverb.lv2/wscript
@@ -13,8 +13,6 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    conf.load('compiler_c')
-    autowaf.configure(conf)
     autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
                       uselib_store='LV2_1_0_0')
 

diff --git a/libs/plugins/reasonablesynth.lv2/wscript b/libs/plugins/reasonablesynth.lv2/wscript
@@ -13,8 +13,6 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    conf.load('compiler_c')
-    autowaf.configure(conf)
     autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
                       uselib_store='LV2_1_0_0')
 

diff --git a/libs/ptformat/wscript b/libs/ptformat/wscript
@@ -24,8 +24,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    conf.load('compiler_cxx')
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     # Library

diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript
@@ -26,9 +26,6 @@ def configure(conf):
     if conf.is_defined('USE_EXTERNAL_LIBS'):
         conf.check_cxx(header_name="base/Pitch.h", mandatory=True)
         conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True)
-    else:
-        conf.load('compiler_cxx')
-        autowaf.configure(conf)
 
 def build(bld):
     if bld.is_defined('USE_EXTERNAL_LIBS'):

diff --git a/libs/surfaces/cc121/wscript b/libs/surfaces/cc121/wscript
@@ -10,7 +10,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')

diff --git a/libs/surfaces/contourdesign/wscript b/libs/surfaces/contourdesign/wscript
@@ -10,7 +10,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')

diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript
@@ -15,7 +15,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):

diff --git a/libs/surfaces/faderport/wscript b/libs/surfaces/faderport/wscript
@@ -10,7 +10,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')

diff --git a/libs/surfaces/faderport8/wscript b/libs/surfaces/faderport8/wscript
@@ -19,7 +19,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure(conf)
+    pass
 
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')