more changes to wscript files to catch up with waf 1.6 and fix OS X issues
[ardour.git] / wscript
diff --git a/wscript b/wscript
index a57f7ae48647146b2bb597ce0d5c6fcbf695f7bc..e400b6e198edf5f1b58ed570d52e462e7dab6216 100644 (file)
--- a/wscript
+++ b/wscript
@@ -1,20 +1,19 @@
 #!/usr/bin/env python
-import autowaf
-import Options
+from waflib.extras import autowaf as autowaf
+from waflib import Options
 import os
 import re
 import string
 import subprocess
 import sys
-import glob
 
 # Variables for 'waf dist'
-VERSION = '3.0alpha3'
+VERSION = '3.0alpha10'
 APPNAME = 'Ardour'
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
 children = [
         'libs/pbd',
@@ -36,614 +35,630 @@ children = [
         'gtk2_ardour',
         'templates',
         'export',
-# this needs to be conditional at some point, since
-# we will not build it or use it on OS X
-        'tools/sanity_check'
 ]
 
+#if config[config_arch] != 'apple':
+#  children += [ 'tools/sanity_check' ]
+
 i18n_children = [
         'gtk2_ardour',
-        'libs/ardour'
+        'libs/ardour',
+        'libs/gtkmm2ext',
 ]
 
+if sys.platform != 'darwin':
+    children += [ 'tools/sanity_check' ]
+else:
+    children += [ 'libs/appleutility' ]
+
 # Version stuff
 
 def fetch_svn_revision (path):
-        cmd = "LANG= svn info " + path + " | awk '/^Revision:/ { print $2}'"
-        return subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
+    cmd = "LANG= svn info " + path + " | awk '/^Revision:/ { print $2}'"
+    return subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
 
-def fetch_gcc_version ():
-        cmd = "LANG= gcc --version"
-        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_gcc_version (CC):
+    cmd = "LANG= %s --version" % CC
+    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 = 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:
-                               line = line.split('@')[1].split(' ')
-                               rev = line[0]
-               except:
-                       pass
-        return rev
+    cmd = "LANG= git log --abbrev HEAD^..HEAD " + path
+    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:
+                line = line.split('@')[1].split(' ')
+                rev = line[0]
+        except:
+            pass
+    return rev
 
 def fetch_bzr_revision (path):
-        cmd = subprocess.Popen("LANG= bzr log -l 1 " + path, stdout=subprocess.PIPE, shell=True)
-        out = cmd.communicate()[0]
-        svn = re.search('^svn revno: [0-9]*', out, re.MULTILINE)
-        str = svn.group(0)
-        chars = 'svnreio: '
-        return string.lstrip(str, chars)
+    cmd = subprocess.Popen("LANG= bzr log -l 1 " + path, stdout=subprocess.PIPE, shell=True)
+    out = cmd.communicate()[0]
+    svn = re.search('^svn revno: [0-9]*', out, re.MULTILINE)
+    str = svn.group(0)
+    chars = 'svnreio: '
+    return string.lstrip(str, chars)
 
 def create_stored_revision():
-        rev = ""
-        if os.path.exists('.svn'):
-               rev = fetch_svn_revision('.');
-        elif os.path.exists('.git'):
-               rev = fetch_git_revision('.');
-        elif os.path.exists('.bzr'):
-               rev = fetch_bzr_revision('.');
-               print("Revision: %s", rev)
-        elif os.path.exists('libs/ardour/svn_revision.cc'):
-               print("Using packaged svn revision")
-               return
-        else:
-               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 = \"%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')
-               sys.exit(-1)
+    rev = ""
+    if os.path.exists('.svn'):
+        rev = fetch_svn_revision('.');
+    elif os.path.exists('.git'):
+        rev = fetch_git_revision('.');
+    elif os.path.exists('.bzr'):
+        rev = fetch_bzr_revision('.');
+        print("Revision: %s", rev)
+    elif os.path.exists('libs/ardour/svn_revision.cc'):
+        print("Using packaged svn revision")
+        return
+    else:
+        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 = \"%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')
+        sys.exit(-1)
 
 def set_compiler_flags (conf,opt):
-        #
-        # Compiler flags and other system-dependent stuff
-        #
-
-        build_host_supports_sse = False
-        optimization_flags = []
-        debug_flags = []
-
-        # guess at the platform, used to define compiler flags
-
-        config_guess = os.popen("tools/config.guess").read()[:-1]
-
-        config_cpu = 0
-        config_arch = 1
-        config_kernel = 2
-        config_os = 3
-        config = config_guess.split ("-")
-
-        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':
-               if config[config_arch] == 'apple':
-                       # The [.] matches to the dot after the major version, "." would match any character
-                       if re.search ("darwin[0-7][.]", config[config_kernel]) != None:
-                               conf.define ('build_target', 'panther')
-                       elif re.search ("darwin8[.]", config[config_kernel]) != None:
-                               conf.define ('build_target', 'tiger')
-                       else:
-                               conf.define ('build_target', 'leopard')
-               else:
-                       if re.search ("x86_64", config[config_cpu]) != None:
-                               conf.define ('build_target', 'x86_64')
-                       elif re.search("i[0-5]86", config[config_cpu]) != None:
-                               conf.define ('build_target', 'i386')
-                       elif re.search("powerpc", config[config_cpu]) != None:
-                               conf.define ('build_target', 'powerpc')
-                       else:
-                               conf.define ('build_target', 'i686')
+    #
+    # Compiler flags and other system-dependent stuff
+    #
+
+    build_host_supports_sse = False
+    optimization_flags = []
+    debug_flags = []
+
+    # guess at the platform, used to define compiler flags
+
+    config_guess = os.popen("tools/config.guess").read()[:-1]
+
+    config_cpu = 0
+    config_arch = 1
+    config_kernel = 2
+    config_os = 3
+    config = config_guess.split ("-")
+
+    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':
+        if config[config_arch] == 'apple':
+            # The [.] matches to the dot after the major version, "." would match any character
+            if re.search ("darwin[0-7][.]", config[config_kernel]) != None:
+                conf.env['build_target'] = 'panther'
+            elif re.search ("darwin8[.]", config[config_kernel]) != None:
+                conf.env['build_target'] = 'tiger'
+            else:
+                conf.env['build_target'] = 'leopard'
         else:
-               conf.define ('build_target', opt.dist_target)
-
-        if config[config_cpu] == 'powerpc' and conf.env['build_target'] != 'none':
-               #
-               # Apple/PowerPC optimization options
-               #
-               # -mcpu=7450 does not reliably work with gcc 3.*
-               #
-               if opt.dist_target == 'panther' or opt.dist_target == 'tiger':
-                       if config[config_arch] == 'apple':
-                               # optimization_flags.extend ([ "-mcpu=7450", "-faltivec"])
-                               # to support g3s but still have some optimization for above
-                               optimization_flags.extend ([ "-mcpu=G3", "-mtune=7450"])
-                       else:
-                               optimization_flags.extend ([ "-mcpu=7400", "-maltivec", "-mabi=altivec"])
-               else:
-                       optimization_flags.extend([ "-mcpu=750", "-mmultiple" ])
-               optimization_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"])
-               optimization_flags.extend (["-Os"])
-
-        elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_64", config[config_cpu]) != None)) and conf.env['build_target'] != 'none':
-    
-    
-               #
-               # ARCH_X86 means anything in the x86 family from i386 to x86_64
-               # USE_X86_64_ASM is used to distingush 32 and 64 bit assembler
-               #
-
-               if (re.search ("(i[0-9]86|x86_64)", config[config_cpu]) != None):
-                       debug_flags.append ("-DARCH_X86")
-                       optimization_flags.append ("-DARCH_X86")
-    
-               if config[config_kernel] == 'linux' :
-
-                       #
-                       # determine processor flags via /proc/cpuinfo
-                       #
-        
-                       if conf.env['build_target'] != 'i386':
-            
-                               flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
-                               x86_flags = flag_line.split (": ")[1:][0].split ()
-            
-                               if "mmx" in x86_flags:
-                                       optimization_flags.append ("-mmmx")
-                               if "sse" in x86_flags:
-                                       build_host_supports_sse = True
-                               if "3dnow" in x86_flags:
-                                       optimization_flags.append ("-m3dnow")
-            
-                       if config[config_cpu] == "i586":
-                               optimization_flags.append ("-march=i586")
-                       elif config[config_cpu] == "i686":
-                               optimization_flags.append ("-march=i686")
-    
-               if ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse:
-                       optimization_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"])
-                       debug_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"])
-
-        # end of processor-specific section
-
-        # optimization section
-        if conf.env['FPU_OPTIMIZATION']:
-               if conf.env['build_target'] == 'tiger' or conf.env['build_target'] == 'leopard':
-                       optimization_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS");
-                       debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS");
-                       conf.env.append_value('LINKFLAGS', "-framework Accelerate")
-               elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64':
-                       optimization_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
-                       debug_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
-               elif conf.env['build_target'] == 'x86_64':
-                       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)")
-        
-        # check this even if we aren't using FPU optimization
-        if not conf.env['HAVE_POSIX_MEMALIGN']:
-               optimization_flags.append("-DNO_POSIX_MEMALIGN")
-
-        # end optimization section
-                       
+            if re.search ("x86_64", config[config_cpu]) != None:
+                conf.env['build_target'] = 'x86_64'
+            elif re.search("i[0-5]86", config[config_cpu]) != None:
+                conf.env['build_target'] = 'i386'
+            elif re.search("powerpc", config[config_cpu]) != None:
+                conf.env['build_target'] = 'powerpc'
+            else:
+                conf.env['build_target'] = 'i686'
+    else:
+        conf.env['build_target'] = opt.dist_target
+
+    if config[config_cpu] == 'powerpc' and conf.env['build_target'] != 'none':
         #
-        # no VST on x86_64
+        # Apple/PowerPC optimization options
         #
-            
-        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.")
-               sys.exit (-1)
-
+        # -mcpu=7450 does not reliably work with gcc 3.*
         #
-        # a single way to test if we're on OS X
-        #
-
-        if conf.env['build_target'] in ['panther', 'tiger', 'leopard' ]:
-               conf.define ('IS_OSX', 1)
-               # force tiger or later, to avoid issues on PPC which defaults
-               # back to 10.1 if we don't tell it otherwise.
-               conf.env.append_value('CCFLAGS', "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040")
-
+        if opt.dist_target == 'panther' or opt.dist_target == 'tiger':
+            if config[config_arch] == 'apple':
+                # optimization_flags.extend ([ "-mcpu=7450", "-faltivec"])
+                # to support g3s but still have some optimization for above
+                optimization_flags.extend ([ "-mcpu=G3", "-mtune=7450"])
+            else:
+                optimization_flags.extend ([ "-mcpu=7400", "-maltivec", "-mabi=altivec"])
         else:
-               conf.define ('IS_OSX', 0)
+            optimization_flags.extend([ "-mcpu=750", "-mmultiple" ])
+        optimization_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"])
+        optimization_flags.extend (["-Os"])
 
-        #
-        # save off guessed arch element in an env
-        #
-        conf.define ('CONFIG_ARCH', config[config_arch])
+    elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_64", config[config_cpu]) != None)) and conf.env['build_target'] != 'none':
 
-        #
-        # ARCH="..." overrides all
-        #
 
-        if opt.arch != None:
-               optimization_flags = opt.arch.split()
-               
         #
-        # prepend boiler plate optimization flags that work on all architectures
+        # ARCH_X86 means anything in the x86 family from i386 to x86_64
+        # USE_X86_64_ASM is used to distingush 32 and 64 bit assembler
         #
 
-        optimization_flags[:0] = [
-               "-O3",
-               "-fomit-frame-pointer",
-               "-ffast-math",
-               "-fstrength-reduce",
-               "-pipe"
-               ]
-
-        if opt.debug:
-               conf.env.append_value('CCFLAGS', debug_flags)
-               conf.env.append_value('CXXFLAGS', debug_flags)
-               conf.env.append_value('LINKFLAGS', debug_flags)
+        if (re.search ("(i[0-9]86|x86_64)", config[config_cpu]) != None):
+            debug_flags.append ("-DARCH_X86")
+            optimization_flags.append ("-DARCH_X86")
+
+        if config[config_kernel] == 'linux' :
+
+            #
+            # determine processor flags via /proc/cpuinfo
+            #
+
+            if conf.env['build_target'] != 'i386':
+
+                flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
+                x86_flags = flag_line.split (": ")[1:][0].split ()
+
+                if "mmx" in x86_flags:
+                    optimization_flags.append ("-mmmx")
+                if "sse" in x86_flags:
+                    build_host_supports_sse = True
+                if "3dnow" in x86_flags:
+                    optimization_flags.append ("-m3dnow")
+
+            if config[config_cpu] == "i586":
+                optimization_flags.append ("-march=i586")
+            elif config[config_cpu] == "i686":
+                optimization_flags.append ("-march=i686")
+
+        if ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse:
+            optimization_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"])
+            debug_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"])
+
+    # end of processor-specific section
+
+    # optimization section
+    if conf.env['FPU_OPTIMIZATION']:
+        if conf.env['build_target'] == 'tiger' or conf.env['build_target'] == 'leopard':
+            optimization_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS");
+            debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS");
+            conf.env.append_value('LINKFLAGS', "-framework Accelerate")
+        elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64':
+            optimization_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
+            debug_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
+        elif conf.env['build_target'] == 'x86_64':
+            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)")
+
+    # check this even if we aren't using FPU optimization
+    if not conf.is_defined('HAVE_POSIX_MEMALIGN'):
+        optimization_flags.append("-DNO_POSIX_MEMALIGN")
+
+    # end optimization section
+
+    #
+    # no VST on x86_64
+    #
+
+    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.")
+        sys.exit (-1)
+
+    if opt.lxvst:
+        if conf.env['build_target'] == 'x86_64':
+            print("\n\n********************************************************")
+            print("* Building with 64Bit linuxVST support is experimental *")
+            print("********************************************************\n\n")
+            conf.env.append_value('CXXFLAGS', "-DLXVST_64BIT")
         else:
-               conf.env.append_value('CCFLAGS', optimization_flags)
-               conf.env.append_value('CXXFLAGS', optimization_flags)
-               conf.env.append_value('LINKFLAGS', optimization_flags)
+            conf.env.append_value('CXXFLAGS', "-DLXVST_32BIT")
+
+    #
+    # a single way to test if we're on OS X
+    #
+
+    if conf.env['build_target'] in ['panther', 'tiger', 'leopard' ]:
+        conf.define ('IS_OSX', 1)
+        # force tiger or later, to avoid issues on PPC which defaults
+        # back to 10.1 if we don't tell it otherwise.
+        conf.env.append_value('CFLAGS', "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040")
+
+    else:
+        conf.define ('IS_OSX', 0)
+
+    #
+    # save off guessed arch element in an env
+    #
+    conf.define ('CONFIG_ARCH', config[config_arch])
+
+    #
+    # ARCH="..." overrides all
+    #
+
+    if opt.arch != None:
+        optimization_flags = opt.arch.split()
+
+    #
+    # prepend boiler plate optimization flags that work on all architectures
+    #
+
+    optimization_flags[:0] = [
+            "-O3",
+            "-fomit-frame-pointer",
+            "-ffast-math",
+            "-fstrength-reduce",
+            "-pipe"
+            ]
+
+    if opt.debug:
+        conf.env.append_value('CFLAGS', debug_flags)
+        conf.env.append_value('CXXFLAGS', debug_flags)
+        conf.env.append_value('LINKFLAGS', debug_flags)
+    else:
+        conf.env.append_value('CFLAGS', optimization_flags)
+        conf.env.append_value('CXXFLAGS', optimization_flags)
+        conf.env.append_value('LINKFLAGS', optimization_flags)
+
+    if opt.stl_debug:
+        conf.env.append_value('CXXFLAGS', "-D_GLIBCXX_DEBUG")
+
+    if conf.env['DEBUG_RT_ALLOC']:
+        conf.env.append_value('CFLAGS', '-DDEBUG_RT_ALLOC')
+        conf.env.append_value('CXXFLAGS', '-DDEBUG_RT_ALLOC')
+        conf.env.append_value('LINKFLAGS', '-ldl')
+
+    if opt.universal:
+        conf.env.append_value('CFLAGS', "-arch i386 -arch ppc")
+        conf.env.append_value('CXXFLAGS', "-arch i386 -arch ppc")
+        conf.env.append_value('LINKFLAGS', "-arch i386 -arch ppc")
+
+    #
+    # warnings flags
+    #
+
+    conf.env.append_value('CFLAGS', "-Wall")
+    conf.env.append_value('CXXFLAGS', [ '-Wall', '-Woverloaded-virtual'])
+
+    if opt.extra_warn:
+        flags = [ '-Wextra' ]
+        conf.env.append_value('CFLAGS', flags)
+        conf.env.append_value('CXXFLAGS', flags)
+
+
+    #
+    # more boilerplate
+    #
+
+    conf.env.append_value('CFLAGS', '-D_LARGEFILE64_SOURCE')
+    conf.env.append_value('CFLAGS', '-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('CFLAGS', '-DENABLE_NLS')
+
+#----------------------------------------------------------------
 
-        if opt.stl_debug:
-               conf.env.append_value('CXXFLAGS', "-D_GLIBCXX_DEBUG")
+# Waf stages
 
-        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')
+def options(opt):
+    opt.load('compiler_c')
+    opt.load('compiler_cxx')
+    autowaf.set_options(opt)
+    opt.add_option('--program-name', type='string', action='store', default='Ardour', dest='program_name',
+                    help='The user-visible name of the program being built')
+    opt.add_option('--arch', type='string', action='store', dest='arch',
+                    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('--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',
+                    help='Build with even more compiler warning flags')
+    opt.add_option('--fpu-optimization', action='store_true', default=True, dest='fpu_optimization',
+                    help='Build runtime checked assembler code (default)')
+    opt.add_option('--no-fpu-optimization', action='store_false', dest='fpu_optimization')
+    opt.add_option('--freedesktop', action='store_true', default=False, dest='freedesktop',
+                    help='Install MIME type, icons and .desktop file as per freedesktop.org standards')
+    opt.add_option('--freesound', action='store_true', default=False, dest='freesound',
+                    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('--lv2', action='store_true', default=False, dest='lv2',
+                    help='Compile with support for LV2 (if SLV2 or Lilv+Suil is available)')
+    opt.add_option('--lxvst', action='store_true', default=False, dest='lxvst',
+                    help='Compile with support for linuxVST plugins')
+    opt.add_option('--nls', action='store_true', default=True, dest='nls',
+                    help='Enable i18n (native language support) (default)')
+    opt.add_option('--no-nls', action='store_false', dest='nls')
+    opt.add_option('--optimize', action='store_false', dest='debug')
+    opt.add_option('--phone-home', action='store_false', default=False, 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',
+                    help='Compile with support for Frontier Designs Tranzport (if libusb is available)')
+    opt.add_option('--universal', action='store_true', default=False, dest='universal',
+                    help='Compile as universal binary (requires that external libraries are universal)')
+    opt.add_option('--versioned', action='store_true', default=False, dest='versioned',
+                    help='Add revision information to executable name inside the build directory')
+    opt.add_option('--vst', action='store_true', default=False, dest='vst',
+                    help='Compile with support for VST')
+    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 \'><\'')
+    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')
+    opt.add_option('--noconfirm', action='store_true', default=False, dest='noconfirm',
+                    help='Do not ask questions that require confirmation during the build')
+    for i in children:
+        opt.recurse(i)
 
-        if opt.universal:
-               conf.env.append_value('CCFLAGS', "-arch i386 -arch ppc")
-               conf.env.append_value('CXXFLAGS', "-arch i386 -arch ppc")
-               conf.env.append_value('LINKFLAGS', "-arch i386 -arch ppc")
+def sub_config_and_use(conf, name, has_objects = True):
+    conf.recurse(name)
+    autowaf.set_local_lib(conf, name, has_objects)
 
+def configure(conf):
+    conf.load('compiler_c')
+    conf.load('compiler_cxx')
+    if not Options.options.noconfirm:
+        print ('\n\nThis is an alpha version of Ardour 3.0.\n\n' +
+               'You are respectfully requested NOT to ask for assistance with build issues\n' +
+               'and not to report issues with Ardour 3.0 on the forums at ardour.org.\n\n' +
+               'Please use IRC, the bug tracker and/or the ardour mailing lists (-dev or -user)\n\n' +
+               'Thanks for your co-operation with our development process.\n\n' +
+               'Press Enter to continue.\n')
+        sys.stdin.readline()
+    create_stored_revision()
+    conf.env['VERSION'] = VERSION
+    conf.line_just = 52
+    autowaf.set_recursive()
+    autowaf.configure(conf)
+    autowaf.display_header('Ardour Configuration')
+
+    gcc_versions = fetch_gcc_version(str(conf.env['CC']))
+    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')
         #
-        # warnings flags
+        #       Define OSX as a uselib to use when compiling
+        #       on Darwin to add all applicable flags at once
         #
+        conf.env.append_value('CXXFLAGS_OSX', '-DMAC_OS_X_VERSION_MIN_REQUIRED=1040')
+        conf.env.append_value('CFLAGS_OSX', '-DMAC_OS_X_VERSION_MIN_REQUIRED=1040')
+        conf.env.append_value('CXXFLAGS_OSX', '-mmacosx-version-min=10.4')
+        conf.env.append_value('CFLAGS_OSX', '-mmacosx-version-min=10.4')
 
-        conf.env.append_value('CCFLAGS', "-Wall")
-        conf.env.append_value('CXXFLAGS', [ '-Wall', '-Woverloaded-virtual'])
-
-        if opt.extra_warn:
-               flags = [ '-Wextra' ]
-               conf.env.append_value('CCFLAGS', flags )
-               conf.env.append_value('CXXFLAGS', flags )
+        #conf.env.append_value('CXXFLAGS_OSX', "-isysroot /Developer/SDKs/MacOSX10.4u.sdk")
+        #conf.env.append_value('CFLAGS_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('CFLAGS_OSX', "-msse")
+        conf.env.append_value('CXXFLAGS_OSX', "-msse2")
+        conf.env.append_value('CFLAGS_OSX', "-msse2")
         #
-        # more boilerplate
+        #       TODO: The previous sse flags NEED to be based
+        #       off processor type.  Need to add in a check
+        #       for that.
         #
-
-        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
-
-def set_options(opt):
-        autowaf.set_options(opt)
-        opt.add_option('--program-name', type='string', action='store', default='Ardour', dest='program_name',
-                       help='The user-visible name of the program being built')
-        opt.add_option('--arch', type='string', action='store', dest='arch',
-                       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('--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',
-                       help='Build with even more compiler warning flags')
-        opt.add_option('--fpu-optimization', action='store_true', default=True, dest='fpu_optimization',
-                       help='Build runtime checked assembler code (default)')
-        opt.add_option('--no-fpu-optimization', action='store_false', dest='fpu_optimization')
-        opt.add_option('--freedesktop', action='store_true', default=False, dest='freedesktop',
-                       help='Install MIME type, icons and .desktop file as per freedesktop.org standards')
-        opt.add_option('--freesound', action='store_true', default=False, dest='freesound',
-                       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('--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',
-                       help='Enable i18n (native language support) (default)')
-        opt.add_option('--no-nls', action='store_false', dest='nls')
-        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',
-                       help='Compile with support for Frontier Designs Tranzport (if libusb is available)')
-        opt.add_option('--universal', action='store_true', default=False, dest='universal',
-                       help='Compile as universal binary (requires that external libraries are universal)')
-        opt.add_option('--versioned', action='store_true', default=False, dest='versioned',
-                       help='Add revision information to executable name inside the build directory')
-        opt.add_option('--vst', action='store_true', default=False, dest='vst',
-                       help='Compile with support for VST')
-        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 \'><\'')
-        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')                      
-        opt.add_option('--noconfirm', action='store_true', default=False, dest='noconfirm',
-                       help='Do not ask questions that require confirmation during the build')
-        for i in children:
-               opt.sub_options(i)
-
-def sub_config_and_use(conf, name, has_objects = True):
-        conf.sub_config(name)
-        autowaf.set_local_lib(conf, name, has_objects)
-
-def configure(conf):
-        if not Options.options.noconfirm:
-                print ('\n\nThis is an alpha version of Ardour 3.0.\n\n' + 
-                       'You are respectfully requested NOT to ask for assistance with build issues\n' +
-                       'and not to report issues with Ardour 3.0 on the forums at ardour.org.\n\n' +
-                       'Please use IRC, the bug tracker and/or the ardour mailing lists (-dev or -user)\n\n' +
-                       'Thanks for your co-operation with our development process.\n\n' +
-                       'Press Enter to continue.\n')
-                sys.stdin.readline()
-        create_stored_revision()
-        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')
-                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', '-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('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")
-               conf.env.append_value('CXXFLAGS_OSX', "-msse2")
-               conf.env.append_value('CCFLAGS_OSX', "-msse2")
-               #
-               #       TODO: The previous sse flags NEED to be based
-               #       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('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')
-
-               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('CXXFLAGS_AUDIOUNITS', "-DHAVE_AUDIOUNITS")
-               conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Audiotoolbox', '-framework', 'AudioUnit'])
-
-        if Options.options.boost_include != '':                                       
-               conf.env.append_value('CPPPATH', Options.options.boost_include)
-
-        autowaf.check_header(conf, 'boost/signals2.hpp', mandatory = True)
-
-        if Options.options.boost_sp_debug:
-               conf.env.append_value('CXXFLAGS', '-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",
-                     mandatory = True,
-                     msg = 'Checking for boost library >= 1.39',
-                     okmsg = 'ok',
-                     errmsg = 'too old\nPlease install boost version 1.39 or higher.')
-
-        autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
-        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:
-               sub_config_and_use(conf, i)
-
-        # Fix utterly braindead FLAC include path to not smash assert.h
-        conf.env['CPPPATH_FLAC'] = []
-
-        conf.check_cc(function_name='dlopen', header_name='dlfcn.h', linkflags='-ldl', uselib_store='DL')
-        conf.check_cc(function_name='curl_global_init', header_name='curl/curl.h', linkflags='-lcurl', uselib_store='CURL')
-
-        # Tell everyone that this is a waf build
-
-        conf.env.append_value('CCFLAGS', '-DWAF_BUILD')
-        conf.env.append_value('CXXFLAGS', '-DWAF_BUILD')
-        
-        # debug builds should not call home
-
-        opts = Options.options
-        if opts.debug:
-                opts.phone_home = False;
-
-        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, 'CoreAudio', bool(conf.env['HAVE_COREAUDIO']))
-        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
-        autowaf.display_msg(conf, 'FPU Optimization', opts.fpu_optimization)
-        if opts.fpu_optimization:
-               conf.define('FPU_OPTIMIZATION', 1)
-        autowaf.display_msg(conf, 'Freedesktop Files', opts.freedesktop)
-        autowaf.display_msg(conf, 'Freesound', opts.freesound)
-        if opts.freesound:
-               conf.define('FREESOUND',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']))
-        autowaf.display_msg(conf, 'Translation', opts.nls)
-        if opts.nls:
-               conf.define ('ENABLE_NLS', 1)
-        autowaf.display_msg(conf, 'Tranzport', opts.tranzport)
-        if opts.build_tests:
-               conf.env['BUILD_TESTS'] = opts.build_tests
-        autowaf.display_msg(conf, 'Unit Tests', bool(conf.env['BUILD_TESTS']) and bool (conf.env['HAVE_CPPUNIT']))
-        if opts.tranzport:
-               conf.define('TRANZPORT', 1)
-        autowaf.display_msg(conf, 'Universal Binary', opts.universal)
-        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)
-        if opts.wiimote:
-               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)
-        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
-
-        config_text = open ('libs/ardour/config_text.cc',"w")
-        config_text.write ('#include "ardour/ardour.h"\n\nnamespace ARDOUR {\nconst char* const ardour_config_info = "\\n\\\n')
-        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['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 ('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 ('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")
-        config_text.write ('Soundtouch: '); config_text.write (str (bool(conf.env['HAVE_SOUNDTOUCH']))); config_text.write ("\\n\\\n")
-        config_text.write ('Translation: '); config_text.write (str (opts.nls)); config_text.write ("\\n\\\n")
-        config_text.write ('Tranzport: '); config_text.write (str (opts.tranzport)); config_text.write ("\\n\\\n")
-        config_text.write ('Universal binary: '); config_text.write (str (opts.universal)); config_text.write ("\\n\\\n")
-        config_text.write ('VST support: '); config_text.write (str (opts.vst)); config_text.write ("\\n\\\n")
-        config_text.write ('Wiimote support: '); config_text.write (str (opts.wiimote)); config_text.write ("\\n\\\n")
-        config_text.write ('Windows key: '); config_text.write (str (opts.windows_key)); config_text.write ("\\n\\\n")
-        config_text.write ('C compiler flags: '); config_text.write (str (conf.env['CCFLAGS'])); config_text.write ("\\n\\\n")
-        config_text.write ('C++ compiler flags: '); config_text.write (str (conf.env['CXXFLAGS'])); config_text.write ("\\n\\\n")
-        config_text.write ('Phone home: '); config_text.write (str (bool(conf.env['PHONE_HOME']))); config_text.write ("\\n\\\n")
-        config_text.write ('JACK session support: '); config_text.write (str (bool(conf.env['JACK_SESSION']))); config_text.write ("\\n\\\n")
-        config_text.write ('";}\n')
-        config_text.close ()
+        conf.env.append_value('CXXFLAGS_OSX', '-F/System/LibraryFrameworks')
+        conf.env.append_value('CXXFLAGS_OSX', '-F/Library/Frameworks')
+
+        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')
+
+        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('CXXFLAGS_AUDIOUNITS', "-DHAVE_AUDIOUNITS")
+        conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Audiotoolbox', '-framework', 'AudioUnit'])
+
+    if Options.options.boost_include != '':
+        conf.env.append_value('CPPPATH', Options.options.boost_include)
+
+    autowaf.check_header(conf, 'cxx', 'boost/signals2.hpp', mandatory = True)
+
+    if Options.options.boost_sp_debug:
+        conf.env.append_value('CXXFLAGS', '-DBOOST_SP_ENABLE_DEBUG_HOOKS')
+
+    autowaf.check_header(conf, 'cxx', 'jack/session.h', define="JACK_SESSION", mandatory = False)
+
+    conf.check_cxx(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
+                  execute = "1",
+                  mandatory = True,
+                  msg = 'Checking for boost library >= 1.39',
+                  okmsg = 'ok',
+                  errmsg = 'too old\nPlease install boost version 1.39 or higher.')
+
+    autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
+    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')
+
+    for i in children:
+        sub_config_and_use(conf, i)
+
+    # Fix utterly braindead FLAC include path to not smash assert.h
+    conf.env['INCLUDES_FLAC'] = []
+
+    conf.check_cc(function_name='dlopen', header_name='dlfcn.h', linkflags='-ldl', uselib_store='DL')
+    conf.check_cc(function_name='curl_global_init', header_name='curl/curl.h', linkflags='-lcurl', uselib_store='CURL')
+
+    # Tell everyone that this is a waf build
+
+    conf.env.append_value('CFLAGS', '-DWAF_BUILD')
+    conf.env.append_value('CXXFLAGS', '-DWAF_BUILD')
+
+    # Set up waf environment and C defines
+    opts = Options.options
+    if opts.debug:
+        opts.phone_home = False;   # debug builds should not call home
+    if opts.phone_home:
+        conf.env['PHONE_HOME'] = opts.phone_home
+    if opts.fpu_optimization:
+        conf.env['FPU_OPTIMIZATION'] = True
+    if opts.freesound:
+        conf.define('FREESOUND',1)
+        conf.env['FREESOUND'] = True
+    if opts.nls:
+        conf.define('ENABLE_NLS', 1)
+        conf.env['ENABLE_NLS'] = True
+    if opts.build_tests:
+        conf.env['BUILD_TESTS'] = opts.build_tests
+    if opts.tranzport:
+        conf.env['TRANZPORT'] = 1
+    if opts.vst:
+        conf.define('VST_SUPPORT', 1)
+        conf.env['VST_SUPPORT'] = True
+        conf.env.append_value('CPPPATH', Options.options.wine_include)
+        autowaf.check_header(conf, 'cxx', 'windows.h', mandatory = True)
+    if opts.lxvst:
+        conf.define('LXVST_SUPPORT', 1)
+        conf.env['LXVST_SUPPORT'] = True
+    if bool(conf.env['JACK_SESSION']):
+        conf.define('HAVE_JACK_SESSION', 1)
+    if opts.wiimote:
+        conf.define('WIIMOTE', 1)
+        conf.env['WIIMOTE'] = True
+    conf.define('WINDOWS_KEY', opts.windows_key)
+    conf.env['PROGRAM_NAME'] = opts.program_name
+    if opts.rt_alloc_debug:
+        conf.define('DEBUG_RT_ALLOC', 1)
+    if not conf.is_defined('HAVE_CPPUNIT'):
+        conf.env['BUILD_TESTS'] = False
+
+    set_compiler_flags (conf, Options.options)
+
+    config_text = open('libs/ardour/config_text.cc', "w")
+    config_text.write('''#include "ardour/ardour.h"
+namespace ARDOUR {
+const char* const ardour_config_info = "\\n\\
+''')
+
+    def write_config_text(title, val):
+        autowaf.display_msg(conf, title, val)
+        config_text.write(title + ': ')
+        config_text.write(str(val))
+        config_text.write("\\n\\\n")
+
+    write_config_text('Build documentation',   conf.env['DOCS'])
+    write_config_text('Debuggable build',      conf.env['DEBUG'])
+    write_config_text('Install prefix',        conf.env['PREFIX'])
+    write_config_text('Strict compiler flags', conf.env['STRICT'])
+
+    write_config_text('Architecture flags',    opts.arch)
+    write_config_text('Aubio',                 conf.is_defined('HAVE_AUBIO'))
+    write_config_text('Build target',          conf.env['build_target'])
+    write_config_text('CoreAudio',             conf.is_defined('HAVE_COREAUDIO'))
+    write_config_text('FLAC',                  conf.is_defined('HAVE_FLAC'))
+    write_config_text('FPU optimization',      opts.fpu_optimization)
+    write_config_text('Freedesktop files',     opts.freedesktop)
+    write_config_text('Freesound',             opts.freesound)
+    write_config_text('JACK session support',  conf.is_defined('JACK_SESSION'))
+    write_config_text('LV2 UI embedding',      conf.is_defined('HAVE_SUIL'))
+    write_config_text('LV2 support',           conf.is_defined('LV2_SUPPORT'))
+    write_config_text('LXVST support',         conf.is_defined('LXVST_SUPPORT'))
+    write_config_text('OGG',                   conf.is_defined('HAVE_OGG'))
+    write_config_text('Phone home',            conf.is_defined('PHONE_HOME'))
+    write_config_text('Program name',          opts.program_name)
+    write_config_text('Rubberband',            conf.is_defined('HAVE_RUBBERBAND'))
+    write_config_text('Samplerate',            conf.is_defined('HAVE_SAMPLERATE'))
+    write_config_text('Soundtouch',            conf.is_defined('HAVE_SOUNDTOUCH'))
+    write_config_text('Translation',           opts.nls)
+    write_config_text('Tranzport',             opts.tranzport)
+    write_config_text('Unit tests',            conf.is_defined('BUILD_TESTS'))
+    write_config_text('Universal binary',      opts.universal)
+    write_config_text('VST support',           opts.vst)
+    write_config_text('Wiimote support',       opts.wiimote)
+    write_config_text('Windows key',           opts.windows_key)
+
+    write_config_text('C compiler flags',      conf.env['CFLAGS'])
+    write_config_text('C++ compiler flags',    conf.env['CXXFLAGS'])
+
+    config_text.write ('";\n}\n')
+    config_text.close ()
+    print('')
 
 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')
-        for i in children:
-               bld.add_subdirs(i)
-
-        # ideally, we'd like to use the OS-provided MIDI API
-        # for default ports. that doesn't work on at least
-        # Fedora (Nov 9th, 2009) so use JACK MIDI on linux.
-        
-        if sys.platform == 'darwin':
-               rc_subst_dict = {
-                       'MIDITAG'    : 'control',
-                       'MIDITYPE'   : 'coremidi',
-                       'JACK_INPUT' : 'auditioner'
-                       }
-        else:
-               rc_subst_dict = {
-                       'MIDITAG'    : 'control',
-                       'MIDITYPE'   : 'jack',
-                       'JACK_INPUT' : 'auditioner'
-                       }
-
-        obj              = bld.new_task_gen('subst')
-        obj.source       = 'ardour.rc.in'
-        obj.target       = 'ardour_system.rc'
-        obj.dict         = rc_subst_dict
-        obj.install_path = '${CONFIGDIR}/ardour3'
+    # 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()
+
+    for i in children:
+        bld.recurse(i)
+
+    # ideally, we'd like to use the OS-provided MIDI API
+    # for default ports. that doesn't work on at least
+    # Fedora (Nov 9th, 2009) so use JACK MIDI on linux.
+
+    if sys.platform == 'darwin':
+        rc_subst_dict = {
+                'MIDITAG'    : 'control',
+                'MIDITYPE'   : 'coremidi',
+                'JACK_INPUT' : 'auditioner'
+                }
+    else:
+        rc_subst_dict = {
+                'MIDITAG'    : 'control',
+                'MIDITYPE'   : 'jack',
+                'JACK_INPUT' : 'auditioner'
+                }
+
+    obj              = bld(features = 'subst')
+    obj.source       = 'ardour.rc.in'
+    obj.target       = 'ardour_system.rc'
+    obj.dict         = rc_subst_dict
+    obj.install_path = '${SYSCONF}/ardour3'
 
 def i18n(bld):
-        bld.recurse (i18n_children)
-
+    bld.recurse (i18n_children)