merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending...
[ardour.git] / wscript
diff --git a/wscript b/wscript
index 4570280d4b88dd4d7f6ff47342c48926e55e70a6..9882898eb41aac9dbaed1f67bbaafbd22abb02c7 100644 (file)
--- a/wscript
+++ b/wscript
@@ -2,15 +2,15 @@
 import autowaf
 import Options
 import os
-import commands
 import re
 import string
 import subprocess
 import sys
+import glob
 
 # Variables for 'waf dist'
 VERSION = '3.0pre0'
-APPNAME = 'ardour'
+APPNAME = 'Ardour'
 
 # Mandatory variables
 srcdir = '.'
@@ -25,14 +25,17 @@ children = [
        'libs/taglib',
        'libs/rubberband',
        'libs/surfaces',
+       'libs/panners',
+       'libs/timecode',
        'libs/ardour',
        'libs/gtkmm2ext',
        'libs/clearlooks-newer',
        'libs/audiographer',
-       'gtk2_ardour'
+       'libs/gnomecanvas',
+       'gtk2_ardour',
+       'templates'
 ]
 
-
 i18n_children = [
        'gtk2_ardour',
        'libs/ardour'
@@ -42,18 +45,20 @@ i18n_children = [
 
 def fetch_svn_revision (path):
        cmd = "LANG= svn info " + path + " | awk '/^Revision:/ { print $2}'"
-       return commands.getoutput(cmd)
+       return subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
 
 def fetch_gcc_version ():
        cmd = "LANG= gcc --version"
-       output = commands.getoutput(cmd).splitlines()
-        version = output[0].split(' ')[2].split('.')
+       output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
+       o = output[0].decode('utf-8')
+       version = o.split(' ')[2].split('.')
        return version
 
 def fetch_git_revision (path):
        cmd = "LANG= git log --abbrev HEAD^..HEAD " + path
-       output = commands.getoutput(cmd).splitlines()
-       rev = output[0].replace ("commit", "git")[0:10]
+       output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
+       o = output[0].decode('utf-8')
+       rev = o.replace ("commit", "git")[0:10]
        for line in output:
                try:
                        if "git-svn-id" in line:
@@ -79,23 +84,23 @@ def create_stored_revision():
                rev = fetch_git_revision('.');
        elif os.path.exists('.bzr'):
                rev = fetch_bzr_revision('.');
-               print "Revision: " + rev;
+               print("Revision: %s", rev)
        elif os.path.exists('libs/ardour/svn_revision.cc'):
-               print "Using packaged svn revision"
+               print("Using packaged svn revision")
                return
        else:
-               print "Missing libs/ardour/svn_revision.cc.  Blame the packager."
+               print("Missing libs/ardour/svn_revision.cc.  Blame the packager.")
                sys.exit(-1)
 
        try:
                text =  '#include "ardour/svn_revision.h"\n'
-               text += 'namespace ARDOUR { const char* svn_revision = \"' + rev + '\"; }\n'
-               print 'Writing svn revision info to libs/ardour/svn_revision.cc'
-               o = file('libs/ardour/svn_revision.cc', 'w')
+               text += 'namespace ARDOUR { const char* svn_revision = \"%s\"; }\n' % rev
+               print('Writing svn revision info to libs/ardour/svn_revision.cc')
+               o = open('libs/ardour/svn_revision.cc', 'w')
                o.write(text)
                o.close()
        except IOError:
-               print 'Could not open libs/ardour/svn_revision.cc for writing\n'
+               print('Could not open libs/ardour/svn_revision.cc for writing\n')
                sys.exit(-1)
 
 def set_compiler_flags (conf,opt):
@@ -105,10 +110,7 @@ def set_compiler_flags (conf,opt):
 
        build_host_supports_sse = False
        optimization_flags = []
-       if opt.gprofile:
-               debug_flags = [ '-pg' ]
-       else:
-               debug_flags = [ ] # waf adds -O0 -g itself. thanks waf!
+       debug_flags = []
 
        # guess at the platform, used to define compiler flags
 
@@ -120,7 +122,13 @@ def set_compiler_flags (conf,opt):
        config_os = 3
        config = config_guess.split ("-")
 
-       print "system triple: " + config_guess
+       autowaf.display_msg(conf, "System Triple", config_guess)
+
+       if opt.gprofile:
+               debug_flags = [ '-pg' ]
+       else:
+               if config[config_arch] != 'apple':
+                  debug_flags = [ '-rdynamic' ] # waf adds -O0 -g itself. thanks waf!
 
        # Autodetect
        if opt.dist_target == 'auto':
@@ -216,10 +224,10 @@ def set_compiler_flags (conf,opt):
                        optimization_flags.append ("-DUSE_X86_64_ASM")
                        debug_flags.append ("-DUSE_X86_64_ASM")
                if not build_host_supports_sse:
-                       print "\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, especially if you are a package maintainer)"
+                       print("\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, especially if you are a package maintainer)")
        
        # check this even if we aren't using FPU optimization
-       if conf.check_cc(function_name='posix_memalign', header_name='stdlib.h', ccflags='-D_XOPEN_SOURCE=600') == False:
+       if not conf.env['HAVE_POSIX_MEMALIGN']:
                optimization_flags.append("-DNO_POSIX_MEMALIGN")
 
        # end optimization section
@@ -229,10 +237,10 @@ def set_compiler_flags (conf,opt):
        #
            
        if conf.env['build_target'] == 'x86_64' and opt.vst:
-               print "\n\n=================================================="
-               print "You cannot use VST plugins with a 64 bit host. Please run waf with --vst=0"
-               print "\nIt is theoretically possible to build a 32 bit host on a 64 bit system."
-               print "However, this is tricky and not recommended for beginners."
+               print("\n\n==================================================")
+               print("You cannot use VST plugins with a 64 bit host. Please run waf with --vst=0")
+               print("\nIt is theoretically possible to build a 32 bit host on a 64 bit system.")
+               print("However, this is tricky and not recommended for beginners.")
                sys.exit (-1)
 
        #
@@ -284,6 +292,11 @@ def set_compiler_flags (conf,opt):
        if opt.stl_debug:
                conf.env.append_value('CXXFLAGS', "-D_GLIBCXX_DEBUG")
 
+       if conf.env['DEBUG_RT_ALLOC']:
+               conf.env.append_value('CCFLAGS', '-DDEBUG_RT_ALLOC')
+               conf.env.append_value('CXXFLAGS', '-DDEBUG_RT_ALLOC')
+               conf.env.append_value('LINKFLAGS', '-ldl')
+
        if opt.universal:
                conf.env.append_value('CCFLAGS', "-arch i386 -arch ppc")
                conf.env.append_value('CXXFLAGS', "-arch i386 -arch ppc")
@@ -306,15 +319,18 @@ def set_compiler_flags (conf,opt):
        # more boilerplate
        #
 
-       conf.env.append_value('CCFLAGS', [ '-D_LARGEFILE64_SOURCE', '-D_LARGEFILE_SOURCE' ])
-       conf.env.append_value('CCFLAGS', [ '-D_FILE_OFFSET_BITS=64', '-D_FILE_OFFSET_BITS=64' ])
-       conf.env.append_value('CXXFLAGS', [ '-D_LARGEFILE64_SOURCE', '-D_LARGEFILE_SOURCE' ])
-       conf.env.append_value('CXXFLAGS', [ '-D_FILE_OFFSET_BITS=64', '-D_FILE_OFFSET_BITS=64' ])
+       conf.env.append_value('CCFLAGS', '-D_LARGEFILE64_SOURCE')
+       conf.env.append_value('CCFLAGS', '-D_FILE_OFFSET_BITS=64')
+       conf.env.append_value('CXXFLAGS', '-D_LARGEFILE64_SOURCE')
+       conf.env.append_value('CXXFLAGS', '-D_FILE_OFFSET_BITS=64')
+
+       conf.env.append_value('CXXFLAGS', '-D__STDC_LIMIT_MACROS')
+       conf.env.append_value('CXXFLAGS', '-D__STDC_FORMAT_MACROS')
+
        if opt.nls:
                conf.env.append_value('CXXFLAGS', '-DENABLE_NLS')
                conf.env.append_value('CCFLAGS', '-DENABLE_NLS')
 
-
 #----------------------------------------------------------------
 
 # Waf stages
@@ -327,10 +343,6 @@ def set_options(opt):
                        help='Architecture-specific compiler flags')
        opt.add_option('--boost-sp-debug', action='store_true', default=False, dest='boost_sp_debug',
                        help='Compile with Boost shared pointer debugging')
-       opt.add_option('--audiounits', action='store_true', default=False, dest='audiounits',
-                       help='Compile with Apple\'s AudioUnit library')
-       opt.add_option('--coreaudio', action='store_true', default=False, dest='coreaudio',
-                       help='Compile with Apple\'s CoreAudio library')
        opt.add_option('--dist-target', type='string', default='auto', dest='dist_target',
                        help='Specify the target for cross-compiling [auto,none,x86,i386,i686,x86_64,powerpc,tiger,leopard]')
        opt.add_option('--extra-warn', action='store_true', default=False, dest='extra_warn',
@@ -344,8 +356,6 @@ def set_options(opt):
                        help='Include Freesound database lookup')
        opt.add_option('--gprofile', action='store_true', default=False, dest='gprofile',
                        help='Compile for use with gprofile')
-       opt.add_option('--gtkosx', action='store_true', default=False, dest='gtkosx',
-                       help='Compile for use with GTK-OSX, not GTK-X11')
        opt.add_option('--lv2', action='store_true', default=False, dest='lv2',
                        help='Compile with support for LV2 (if slv2 is available)')
        opt.add_option('--nls', action='store_true', default=True, dest='nls',
@@ -354,6 +364,8 @@ def set_options(opt):
        opt.add_option('--phone-home', action='store_false', default=True, dest='phone_home')
        opt.add_option('--stl-debug', action='store_true', default=False, dest='stl_debug',
                        help='Build with debugging for the STL')
+       opt.add_option('--rt-alloc-debug', action='store_true', default=False, dest='rt_alloc_debug',
+                       help='Build with debugging for memory allocation in the real-time thread')
        opt.add_option('--test', action='store_true', default=False, dest='build_tests', 
                        help="Build unit tests")
        opt.add_option('--tranzport', action='store_true', default=False, dest='tranzport',
@@ -367,9 +379,12 @@ def set_options(opt):
        opt.add_option('--wiimote', action='store_true', default=False, dest='wiimote',
                        help='Build the wiimote control surface')
        opt.add_option('--windows-key', type='string', action='store', dest='windows_key', default='Mod4><Super',
-                      help='X Modifier(s) (Mod1,Mod2, etc) for the Windows key (X11 builds only). ' +
-                      'Multiple modifiers must be separated by \'><\'')
-
+                       help='X Modifier(s) (Mod1,Mod2, etc) for the Windows key (X11 builds only). ' +
+                       'Multiple modifiers must be separated by \'><\'')
+       opt.add_option('--boost-include', type='string', action='store', dest='boost_include', default='',
+                       help='directory where Boost header files can be found')                
+       opt.add_option('--wine-include', type='string', action='store', dest='wine_include', default='/usr/include/wine/windows',
+                       help='directory where Wine\'s Windows header files can be found')                      
        for i in children:
                opt.sub_options(i)
 
@@ -379,30 +394,42 @@ def sub_config_and_use(conf, name, has_objects = True):
 
 def configure(conf):
        create_stored_revision()
-        conf.env['VERSION'] = VERSION
+       conf.env['VERSION'] = VERSION
+       conf.line_just = 52
        autowaf.set_recursive()
        autowaf.configure(conf)
+       autowaf.display_header('Ardour Configuration')
 
        gcc_versions = fetch_gcc_version()
-        if not Options.options.debug and gcc_versions[0] == '4' and gcc_versions[1] > '4':
-                print 'Version 4.5 of gcc is not ready for use when compiling Ardour with optimization.'
-                print 'Please use a different version or re-configure with --debug'
+       if not Options.options.debug and gcc_versions[0] == '4' and gcc_versions[1] > '4':
+                print('Version 4.5 of gcc is not ready for use when compiling Ardour with optimization.')
+                print('Please use a different version or re-configure with --debug')
                 exit (1)
 
        if sys.platform == 'darwin':
+
+               conf.define ('AUDIOUNITS', 1)
+               conf.define ('AU_STATE_SUPPORT', 1)
+               conf.define ('COREAUDIO', 1)
+               conf.define ('GTKOSX', 1)
+               conf.define ('TOP_MENUBAR',1)
+               conf.define ('GTKOSX',1)
+
+               conf.env.append_value('CXXFLAGS_APPLEUTILITY', '-I../libs')
                #
                #       Define OSX as a uselib to use when compiling
                #       on Darwin to add all applicable flags at once
                #
-               conf.env.append_value('CXXFLAGS_OSX', "-mmacosx-version-min=10.4")
-               conf.env.append_value('CCFLAGS_OSX', "-mmacosx-version-min=10.4")
-               conf.env.append_value('CXXFLAGS_OSX', "-isysroot /Developer/SDKs/MacOSX10.4u.sdk")
-               conf.env.append_value('CCFLAGS_OSX', "-isysroot /Developer/SDKs/MacOSX10.4u.sdk")
-               conf.env.append_value('LINKFLAGS_OSX', "-mmacosx-version-min=10.4")
-               conf.env.append_value('LINKFLAGS_OSX', "-isysroot /Developer/SDKs/MacOSX10.4u.sdk")
+               conf.env.append_value('CXXFLAGS_OSX', '-DMAC_OS_X_VERSION_MIN_REQUIRED=1040')
+               conf.env.append_value('CCFLAGS_OSX', '-DMAC_OS_X_VERSION_MIN_REQUIRED=1040')
+               conf.env.append_value('CXXFLAGS_OSX', '-mmacosx-version-min=10.4')
+               conf.env.append_value('CCFLAGS_OSX', '-mmacosx-version-min=10.4')
 
-               conf.env.append_value('LINKFLAGS_OSX', "-sysroot /Developer/SDKs/MacOSX10.4u.sdk")
-               conf.env.append_value('LINKFLAGS_OSX', "-F/System/Library/Frameworks")
+               #conf.env.append_value('CXXFLAGS_OSX', "-isysroot /Developer/SDKs/MacOSX10.4u.sdk")
+               #conf.env.append_value('CCFLAGS_OSX', "-isysroot /Developer/SDKs/MacOSX10.4u.sdk")
+               #conf.env.append_value('LINKFLAGS_OSX', "-isysroot /Developer/SDKs/MacOSX10.4u.sdk")
+
+               #conf.env.append_value('LINKFLAGS_OSX', "-sysroot /Developer/SDKs/MacOSX10.4u.sdk")
 
                conf.env.append_value('CXXFLAGS_OSX', "-msse")
                conf.env.append_value('CCFLAGS_OSX', "-msse")
@@ -413,71 +440,33 @@ def configure(conf):
                #       off processor type.  Need to add in a check
                #       for that.
                #
+               conf.env.append_value('CXXFLAGS_OSX', '-F/System/LibraryFrameworks')
+               conf.env.append_value('CXXFLAGS_OSX', '-F/Library/Frameworks')
 
-               conf.env.append_value('CPPPATH_OSX', "/System/Library/Frameworks/")
-               conf.env.append_value('CPPPATH_OSX', "/usr/include/")
-               conf.env.append_value('CPPPATH_OSX', "/usr/include/c++/4.0.0")
-               conf.env.append_value('CPPPATH_OSX', "/usr/include/c++/4.0.0/i686-apple-darwin8/")
-               #
-               #       TODO: Fix the above include path, it needs to be
-               #       defined based off what is read in the configuration
-               #       stage about the machine(PPC, X86, X86_64, etc.)
-               #
-               conf.env.append_value('CPPPATH_OSX', "/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/")
-               #
-               #       TODO: Likewise this needs to be defined not only
-               #       based off the machine characteristics, but also
-               #       based off the version of GCC being used.
-               #
-
-               conf.env.append_value('FRAMEWORK_OSX', ['CoreFoundation'])
+               conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'AppKit'])
+               conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreAudio'])
+               conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreFoundation'])
+               conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreServices'])
 
-               conf.env.append_value('LINKFLAGS_OSX', ['-undefined', 'suppress'])
-               conf.env.append_value('LINKFLAGS_OSX', "-flat_namespace")
-               #
-               #       The previous 2 flags avoid circular dependencies
-               #       between libardour and libardour_cp on OS X.
-               #       ld reported -undefined suppress as an unknown option
-               #       in one of the tests ran, removing it for the moment
-               #
-               conf.env.append_value('CXXFLAGS_OSX', "-F/System/Library/Frameworks")
-               conf.env.append_value('CCFLAGS_OSX', "-F/System/Library/Frameworks")
+               conf.env.append_value('LINKFLAGS_OSX', ['-undefined', 'suppress' ])
+               conf.env.append_value('LINKFLAGS_OSX', '-flat_namespace')
 
-               # GTKOSX only builds on darwin anyways
-               if Options.options.gtkosx:
-                       #
-                       #       Define Include Paths for GTKOSX
-                       #
-                       conf.env.append_value('CXXFLAGS_GTKOSX', '-DTOP_MENUBAR')
-                       conf.env.append_value('CXXFLAGS_GTKOSX', '-DGTKOSX')
-                       conf.env.append_value('LINKFLAGS_GTKOSX', "-framework AppKit")
-                       conf.env.append_value('LINKFLAGS_GTKOSX', "-Xlinker -headerpad")
-                       conf.env.append_value('LINKFLAGS_GTKOSX', "-Xlinker 2048")
-                       conf.env.append_value('CPPPATH_GTKOSX', "/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/")
+               conf.env.append_value('LINKFLAGS_GTKOSX', [ '-Xlinker', '-headerpad'])
+               conf.env.append_value('LINKFLAGS_GTKOSX', ['-Xlinker', '2048'])
+               conf.env.append_value('CPPPATH_GTKOSX', "/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/")
        
-               if Options.options.coreaudio:
-                       conf.check_cc (header_name = '/System/Library/Frameworks/CoreAudio.framework/Headers/CoreAudio.h',
-                                      define_name = 'HAVE_COREAUDIO', linkflags = ['-framework CoreAudio'],
-                                      uselib_store="COREAUDIO")
-                       conf.check_cxx (header_name = '/System/Library/Frameworks/AudioToolbox.framework/Headers/ExtendedAudioFile.h',
-                                       linkflags = [ '-framework AudioToolbox' ], uselib_store="COREAUDIO")
-                       conf.check_cc (header_name = '/System/Library/Frameworks/CoreServices.framework/Headers/CoreServices.h',
-                                      linkflags = ['-framework CoreServices'], uselib_store="COREAUDIO")
-
-               if Options.options.audiounits:
-                       #conf.env.append_value('CXXFLAGS_AUDIOUNIT', "-DHAVE_AUDIOUNITS")
-                       conf.env.append_value('FRAMEWORK_AUDIOUNIT', ['AudioToolbox'])
-                       conf.env.append_value('FRAMEWORK_AUDIOUNIT', ['CoreServices'])
-                       conf.check_cc (header_name = '/System/Library/Frameworks/AudioUnit.framework/Headers/AudioUnit.h',
-                                      define_name = 'HAVE_AUDIOUNITS', linkflags = [ '-framework AudioUnit' ],
-                                      uselib_store="AUDIOUNIT")
+               conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DHAVE_AUDIOUNITS")
+               conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Audiotoolbox', '-framework', 'AudioUnit'])
 
-       if Options.options.boost_sp_debug:
-               conf.env.append_value('CXXFLAGS', '-DBOOST_SP_ENABLE_DEBUG_HOOKS')
+       if Options.options.boost_include != '':                                
+               conf.env.append_value('CPPPATH', Options.options.boost_include)
 
        autowaf.check_header(conf, 'boost/signals2.hpp', mandatory = True)
 
-       autowaf.check_header(conf, 'jack/session.h', define="JACK_SESSION")
+       if Options.options.boost_sp_debug:
+               conf.env.append_value('CXXFLAGS_BOOST', '-DBOOST_SP_ENABLE_DEBUG_HOOKS')
+
+       autowaf.check_header(conf, 'jack/session.h', define="JACK_SESSION", mandatory = False)
 
        conf.check_cc(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
                      execute = "1",
@@ -490,6 +479,8 @@ def configure(conf):
        autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2')
        autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.2')
        autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0')
+       autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18')
+
        if sys.platform == 'darwin':
                sub_config_and_use(conf, 'libs/appleutility')
        for i in children:
@@ -506,24 +497,17 @@ def configure(conf):
        conf.env.append_value('CCFLAGS', '-DWAF_BUILD')
        conf.env.append_value('CXXFLAGS', '-DWAF_BUILD')
        
-       autowaf.print_summary(conf)
-
         # debug builds should not call home
 
        opts = Options.options
-        if opts.debug:
+       if opts.debug:
                 opts.phone_home = False;
 
-       autowaf.display_header('Ardour Configuration')
        autowaf.display_msg(conf, 'Build Target', conf.env['build_target'])
        autowaf.display_msg(conf, 'Architecture flags', opts.arch)
        autowaf.display_msg(conf, 'Aubio', bool(conf.env['HAVE_AUBIO']))
-       autowaf.display_msg(conf, 'AudioUnits', opts.audiounits)
        autowaf.display_msg(conf, 'CoreAudio', bool(conf.env['HAVE_COREAUDIO']))
-       if bool(conf.env['HAVE_COREAUDIO']):
-               conf.define ('COREAUDIO', 1)
-       if opts.audiounits:
-               conf.define('AUDIOUNITS',1)
+       autowaf.display_msg(conf, 'FLAC', bool(conf.env['HAVE_FLAC']))
        autowaf.display_msg(conf, 'Phone Home', opts.phone_home)
        if opts.phone_home:
                conf.env['PHONE_HOME'] = opts.phone_home
@@ -534,10 +518,8 @@ def configure(conf):
        autowaf.display_msg(conf, 'Freesound', opts.freesound)
        if opts.freesound:
                conf.define('FREESOUND',1)
-       autowaf.display_msg(conf, 'GtkOSX', opts.gtkosx)
-       if opts.gtkosx:
-               conf.define ('GTKOSX', 1)
        autowaf.display_msg(conf, 'LV2 Support', bool(conf.env['HAVE_SLV2']))
+       autowaf.display_msg(conf, 'OGG', bool(conf.env['HAVE_OGG']))
        autowaf.display_msg(conf, 'Rubberband', bool(conf.env['HAVE_RUBBERBAND']))
        autowaf.display_msg(conf, 'Samplerate', bool(conf.env['HAVE_SAMPLERATE']))
        autowaf.display_msg(conf, 'Soundtouch', bool(conf.env['HAVE_SOUNDTOUCH']))
@@ -554,6 +536,8 @@ def configure(conf):
        autowaf.display_msg(conf, 'VST Support', opts.vst)
        if opts.vst:
                conf.define('VST_SUPPORT', 1)
+               conf.env.append_value('CPPPATH', Options.options.wine_include)
+               autowaf.check_header(conf, 'windows.h', mandatory = True)
        if bool(conf.env['JACK_SESSION']):
                conf.define ('HAVE_JACK_SESSION', 1)
        autowaf.display_msg(conf, 'Wiimote Support', opts.wiimote)
@@ -561,13 +545,16 @@ def configure(conf):
                conf.define('WIIMOTE',1)
        conf.define('WINDOWS_KEY', opts.windows_key)
        autowaf.display_msg(conf, 'Windows Key', opts.windows_key)
-        conf.env['PROGRAM_NAME'] = opts.program_name
-        autowaf.display_msg(conf, 'Program Name', opts.program_name)
+       conf.env['PROGRAM_NAME'] = opts.program_name
+       autowaf.display_msg(conf, 'Program Name', opts.program_name)
+       if opts.rt_alloc_debug:
+               conf.define('DEBUG_RT_ALLOC', 1)
 
        set_compiler_flags (conf, Options.options)
 
        autowaf.display_msg(conf, 'C Compiler flags', conf.env['CCFLAGS'])
        autowaf.display_msg(conf, 'C++ Compiler flags', conf.env['CXXFLAGS'])
+       print()
 
        # and dump the same stuff to a file for use in the build
 
@@ -576,16 +563,13 @@ def configure(conf):
        config_text.write ("Install prefix: "); config_text.write (str (conf.env['PREFIX'])); config_text.write ("\\n\\\n")
        config_text.write ("Debuggable build: "); config_text.write (str (str(conf.env['DEBUG']))); config_text.write ("\\n\\\n")
        config_text.write ("Strict compiler flags: "); config_text.write (str (str(conf.env['STRICT']))); config_text.write ("\\n\\\n")
-       config_text.write ("Build documentation: "); config_text.write (str (str(conf.env['BUILD_DOCS']))); config_text.write ("\\n\\\n")
+       config_text.write ("Build documentation: "); config_text.write (str (str(conf.env['DOCS']))); config_text.write ("\\n\\\n")
        config_text.write ('Build target: '); config_text.write (str (conf.env['build_target'])); config_text.write ("\\n\\\n")
        config_text.write ('Architecture flags: '); config_text.write (str (opts.arch)); config_text.write ("\\n\\\n")
        config_text.write ('Aubio: '); config_text.write (str (bool(conf.env['HAVE_AUBIO']))); config_text.write ("\\n\\\n")
-       config_text.write ('AudioUnits: '); config_text.write (str (opts.audiounits)); config_text.write ("\\n\\\n")
-       config_text.write ('CoreAudio: '); config_text.write (str (bool(conf.env['HAVE_COREAUDIO']))); config_text.write ("\\n\\\n")
        config_text.write ('FPU optimization: '); config_text.write (str (opts.fpu_optimization)); config_text.write ("\\n\\\n")
        config_text.write ('Freedesktop files: '); config_text.write (str (opts.freedesktop)); config_text.write ("\\n\\\n")
        config_text.write ('Freesound: '); config_text.write (str (opts.freesound)); config_text.write ("\\n\\\n")
-       config_text.write ('GtkOSX: '); config_text.write (str (opts.gtkosx)); config_text.write ("\\n\\\n")
        config_text.write ('LV2 support: '); config_text.write (str (bool(conf.env['HAVE_SLV2']))); config_text.write ("\\n\\\n")
        config_text.write ('Rubberband: '); config_text.write (str (bool(conf.env['HAVE_RUBBERBAND']))); config_text.write ("\\n\\\n")
        config_text.write ('Samplerate: '); config_text.write (str (bool(conf.env['HAVE_SAMPLERATE']))); config_text.write ("\\n\\\n")
@@ -604,6 +588,18 @@ def configure(conf):
        config_text.close ()
 
 def build(bld):
+        # add directories that contain only headers, to workaround an issue with waf
+
+        bld.path.find_dir ('libs/evoral/evoral')
+        bld.path.find_dir ('libs/vamp-sdk/vamp-sdk')
+        bld.path.find_dir ('libs/surfaces/control_protocol/control_protocol')
+        bld.path.find_dir ('libs/timecode/timecode')
+        bld.path.find_dir ('libs/rubberband/rubberband')
+        bld.path.find_dir ('libs/gtkmm2ext/gtkmm2ext')
+        bld.path.find_dir ('libs/ardour/ardour')
+        bld.path.find_dir ('libs/taglib/taglib')
+        bld.path.find_dir ('libs/pbd/pbd')
+
        autowaf.set_recursive()
        if sys.platform == 'darwin':
                bld.add_subdirs('libs/appleutility')