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

Avoid repeated pointless configure messages like:
Checking for 'g++' (C++ compiler!)                   : /usr/lib64/ccache/g++
Checking for 'gcc' (C compiler)                      : /usr/lib64/ccache/gcc
This commit is contained in:
Mads Kiilerich 2022-01-22 22:09:13 +01:00
parent 7f6ce9a010
commit 8bb91099c5
68 changed files with 31 additions and 112 deletions

View File

@ -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

View File

@ -23,8 +23,6 @@ def options(opt):
def configure(conf):
conf.load('misc')
conf.load('compiler_cxx')
autowaf.configure(conf)
def build(bld):

View File

@ -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')

View File

@ -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',

View File

@ -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)

View File

@ -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)

View File

@ -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'):

View File

@ -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')

View File

@ -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"

View File

@ -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')

View File

@ -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':

View File

@ -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)

View File

@ -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')

View File

@ -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:

View File

@ -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):

View File

@ -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')

View File

@ -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)

View File

@ -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'):

View File

@ -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')

View File

@ -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')

View File

@ -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'):

View File

@ -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'):

View File

@ -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'],

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -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' ]

View File

@ -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)

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -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

View File

@ -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'):

View File

@ -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')

View File

@ -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')

View File

@ -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'):

View File

@ -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')

View File

@ -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')

View File

@ -10,7 +10,7 @@ def options(opt):
autowaf.set_options(opt)
def configure(conf):
autowaf.configure(conf)
pass
def build(bld):
# Generic MIDI

View File

@ -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')

View File

@ -12,8 +12,7 @@ def options(opt):
def configure(conf):
conf.load('compiler_cxx')
autowaf.configure(conf)
pass
def build(bld):

View File

@ -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')

View File

@ -10,8 +10,6 @@ def options(opt):
autowaf.set_options(opt)
def configure(conf):
conf.load ('compiler_cxx')
autowaf.configure(conf)
autowaf.check_pkg(conf, 'pangomm-1.4', uselib_store='PANGOMM', atleast_version='1.4', mandatory=True)
autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4', mandatory=True)

View File

@ -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')

View File

@ -10,8 +10,6 @@ def options(opt):
autowaf.set_options(opt)
def configure(conf):
conf.load ('compiler_cxx')
autowaf.configure(conf)
autowaf.check_pkg(conf, 'pangomm-1.4', uselib_store='PANGOMM', atleast_version='1.4', mandatory=True)
autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4', mandatory=True)

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -41,7 +41,6 @@ def configure(conf):
global children
autowaf.set_recursive()
autowaf.configure(conf)
autowaf.check_pkg(conf, 'libusb-1.0', uselib_store='USB', mandatory=False)
#if Options.options.tranzport and conf.is_defined('HAVE_USB'):

View File

@ -40,8 +40,7 @@ def options(opt):
autowaf.set_options(opt)
def configure(conf):
conf.load('compiler_cxx')
autowaf.configure(conf)
pass
def build(bld):
# Library

View File

@ -23,8 +23,6 @@ def options(opt):
autowaf.set_options(opt)
def configure(conf):
conf.load('compiler_cxx')
autowaf.configure(conf)
autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
atleast_version='0.3.2')

View File

@ -20,8 +20,7 @@ def options(opt):
autowaf.set_options(opt)
def configure(conf):
conf.load('compiler_cxx')
autowaf.configure(conf)
pass
def build(bld):
# Library

View File

@ -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):
if bld.env['build_target'] == 'mingw':

View File

@ -35,8 +35,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):

View File

@ -59,8 +59,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):

View File

@ -29,8 +29,6 @@ def options(opt):
autowaf.set_options(opt)
def configure(conf):
conf.load ('compiler_cxx')
autowaf.configure(conf)
autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
def build(bld):

View File

@ -37,8 +37,7 @@ def options(opt):
autowaf.set_options(opt)
def configure(conf):
conf.load ('compiler_cxx')
autowaf.configure(conf)
pass
def build(bld):
obj = bld.stlib(features = 'cxx cxxstlib', source = zresampler_sources)

View File

@ -17,14 +17,12 @@ def options(opt):
def configure(conf):
conf.load('misc')
conf.load('compiler_cxx')
conf.check_cc(
header_name='stdio.h readline/readline.h',
lib='readline',
uselib_store='READLINE',
define_name='HAVE_READLINE',
mandatory=False)
autowaf.configure(conf)
def build(bld):
VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR'])

View File

@ -24,8 +24,6 @@ def configure(conf):
autowaf.display_msg(conf, 'build session-utils', 'yes')
conf.load('misc')
conf.load('compiler_cxx')
autowaf.configure(conf)
def build_ardour_util(bld, util):
pgmprefix = bld.env['PROGRAM_NAME'].lower() + str(bld.env['MAJOR'])

View File

@ -13,8 +13,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 cprogram')

View File

@ -11,8 +11,7 @@ def options(opt):
autowaf.set_options(opt)
def configure(conf):
conf.load('compiler_cxx')
autowaf.configure(conf)
pass
def build(bld):
obj = bld(features = 'cxx cxxprogram')