breakout control protocol code into LGPL library; fix panner buttons even more than...
[ardour.git] / SConstruct
index bb7096cd43be1516916b2e580ed93b68c5c86fc8..15d7ac743698f1712dcee8656d402368664217fa 100644 (file)
@@ -1,3 +1,5 @@
+# -*- python -*-
+
 import os
 import sys
 import re
@@ -5,12 +7,14 @@ import shutil
 import glob
 import errno
 import time
+import platform
+from sets import Set
 import SCons.Node.FS
 
 SConsignFile()
 EnsureSConsVersion(0, 96)
 
-version = '1.9beta1'
+version = '2.0alpha2'
 
 subst_dict = { }
 
@@ -20,20 +24,21 @@ subst_dict = { }
 
 opts = Options('scache.conf')
 opts.AddOptions(
-    BoolOption('ALTIVEC', 'Compile using Altivec instructions', 0),
   ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''),
-    BoolOption('DEBIAN', 'Debian build options (no internal versions of 3rd party libraries)', 0),
+    BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0),
     BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0),
     PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'),
-    BoolOption('DEVBUILD', 'Use shared libardour (developers only)', 0),
     BoolOption('NLS', 'Set to turn on i18n support', 1),
-    BoolOption('NOARCH', 'Do not use architecture-specific compilation flags', 0),
     PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'),
     BoolOption('VST', 'Compile with support for VST', 0),
-    BoolOption('VERSIONED', 'Add version information to ardour/gtk executable name inside the build directory', 0)
+    BoolOption('VERSIONED', 'Add version information to ardour/gtk executable name inside the build directory', 0),
+    EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2),
+    BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
+    BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0),
+    BoolOption('SURFACES', 'Build support for control surfaces', 0),
+    BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0)
   )
 
-
 #----------------------------------------------------------------------
 # a handy helper that provides a way to merge compile/link information
 # from multiple different "environments"
@@ -49,6 +54,10 @@ class LibraryInfo(Environment):
             self.Append (LIBPATH = other.get ('LIBPATH', []))  
             self.Append (CPPPATH = other.get('CPPPATH', []))
             self.Append (LINKFLAGS = other.get('LINKFLAGS', []))
+       self.Replace(LIBPATH = list(Set(self.get('LIBPATH', []))))
+       self.Replace(CPPPATH = list(Set(self.get('CPPPATH',[]))))
+       #doing LINKFLAGS breaks -framework
+    #doing LIBS break link order dependency
 
 
 env = LibraryInfo (options = opts,
@@ -222,17 +231,17 @@ def version_builder (target, source, env):
    try:
       o = file (target[0].get_path(), 'w')
       o.write (text)
-      o.close ();
+      o.close ()
    except IOError:
       print "Could not open", target[0].get_path(), " for writing\n"
       sys.exit (-1)
 
-   text  = "#ifndef __" + env['DOMAIN'] + "_version_h__\n";
-   text += "#define __" + env['DOMAIN'] + "_version_h__\n";
+   text  = "#ifndef __" + env['DOMAIN'] + "_version_h__\n"
+   text += "#define __" + env['DOMAIN'] + "_version_h__\n"
    text += "extern int " + env['DOMAIN'] + "_major_version;\n"
    text += "extern int " + env['DOMAIN'] + "_minor_version;\n"
    text += "extern int " + env['DOMAIN'] + "_micro_version;\n"
-   text += "#endif /* __" + env['DOMAIN'] + "_version_h__ */\n";
+   text += "#endif /* __" + env['DOMAIN'] + "_version_h__ */\n"
 
    try:
       o = file (target[1].get_path(), 'w')
@@ -278,7 +287,7 @@ def versioned_builder(target,source,env):
         print "No SConscript CVS update info found - versioned executable cannot be built"
         return -1
 
-    tag = time.strftime ('%Y%M%d%H%m', time.strptime (last_date));
+    tag = time.strftime ('%Y%M%d%H%m', time.strptime (last_date))
     print "The current build ID is " + tag
 
     tagged_executable = source[0].get_path() + '-' + tag
@@ -314,7 +323,7 @@ def distcopy (target, source, env):
     cmd += " ".join ([ "'%s'" % quoted for quoted in all_files])
     cmd += ' | (cd ' + treedir + ' && tar xf -)'
     p = os.popen (cmd)
-    return p.close ();
+    return p.close ()
 
 def tarballer (target, source, env):            
     cmd = 'tar -jcf ' + str (target[0]) +  ' ' + str(source[0]) + "  --exclude '*~'"
@@ -340,7 +349,7 @@ env.Append (BUILDERS = {'Tarball' : tarball_bld})
 
 libraries = { }
 
-libraries['core'] = LibraryInfo (CPPPATH = [ '#libs'])
+libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs')
 
 libraries['sndfile'] = LibraryInfo()
 libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile')
@@ -354,12 +363,19 @@ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor')
 libraries['samplerate'] = LibraryInfo()
 libraries['samplerate'].ParseConfig('pkg-config --cflags --libs samplerate')
 
+if env['FFT_ANALYSIS']: 
+       libraries['fftw3f'] = LibraryInfo()
+       libraries['fftw3f'].ParseConfig('pkg-config --cflags --libs fftw3f')
+
 libraries['jack'] = LibraryInfo()
 libraries['jack'].ParseConfig('pkg-config --cflags --libs jack')
 
 libraries['xml'] = LibraryInfo()
 libraries['xml'].ParseConfig('pkg-config --cflags --libs libxml-2.0')
 
+libraries['xslt'] = LibraryInfo()
+libraries['xslt'].ParseConfig('pkg-config --cflags --libs libxslt')
+
 libraries['glib2'] = LibraryInfo()
 libraries['glib2'].ParseConfig ('pkg-config --cflags --libs glib-2.0')
 libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0')
@@ -374,16 +390,69 @@ libraries['pango'].ParseConfig ('pkg-config --cflags --libs pango')
 libraries['libgnomecanvas2'] = LibraryInfo()
 libraries['libgnomecanvas2'].ParseConfig ('pkg-config --cflags --libs libgnomecanvas-2.0')
 
-libraries['ardour2'] = LibraryInfo (LIBS='ardour2', LIBPATH='#libs/ardour2', CPPPATH='#libs/ardour2')
+#libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
+
+# The Ardour Control Protocol Library
+
+libraries['ardour_cp'] = LibraryInfo (LIBS='ardour_cp', LIBPATH='#libs/surfaces/control_protocol',
+                                      CPPPATH='#libs/surfaces/control_protocol')
+
+# The Ardour backend/engine
+
+libraries['ardour'] = LibraryInfo (LIBS='ardour', LIBPATH='#libs/ardour', CPPPATH='#libs/ardour')
 libraries['midi++2'] = LibraryInfo (LIBS='midi++', LIBPATH='#libs/midi++2', CPPPATH='#libs/midi++2')
 libraries['pbd3']    = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd3', CPPPATH='#libs/pbd3')
 libraries['gtkmm2ext'] = LibraryInfo (LIBS='gtkmm2ext', LIBPATH='#libs/gtkmm2ext', CPPPATH='#libs/gtkmm2ext')
-libraries['cassowary'] = LibraryInfo (LIBS='cassowary', LIBPATH='#libs/cassowary', CPPPATH='#libs/cassowary')
+#libraries['cassowary'] = LibraryInfo(LIBS='cassowary', LIBPATH='#libs/cassowary', CPPPATH='#libs/cassowary')
 
 libraries['fst'] = LibraryInfo()
 if env['VST']:
     libraries['fst'].ParseConfig('pkg-config --cflags --libs libfst')
 
+#
+# Check for libusb
+
+libraries['usb'] = LibraryInfo ()
+
+conf = Configure (libraries['usb'])
+if conf.CheckLib ('usb', 'usb_interrupt_write'):
+    have_libusb = True
+else:
+    have_libusb = False
+    
+libraries['usb'] = conf.Finish ()
+
+#
+# Check for liblo
+
+libraries['lo'] = LibraryInfo ()
+
+conf = Configure (libraries['lo'])
+if conf.CheckLib ('lo', 'lo_server_new') == False:
+    print "liblo does not appear to be installed."
+    exit (0)
+    
+libraries['lo'] = conf.Finish ()
+
+#
+# Check for dmalloc
+
+libraries['dmalloc'] = LibraryInfo ()
+
+#
+# look for the threaded version
+#
+
+conf = Configure (libraries['dmalloc'])
+if conf.CheckLib ('dmallocth', 'dmalloc_shutdown'):
+    have_libdmalloc = True
+else:
+    have_libdmalloc = False
+    
+libraries['dmalloc'] = conf.Finish ()
+
+#
+
 #
 # Audio/MIDI library (needed for MIDI, since audio is all handled via JACK)
 # 
@@ -397,33 +466,54 @@ if conf.CheckCHeader('alsa/asoundlib.h'):
     subst_dict['%MIDITYPE%'] = "alsa/sequencer"
 elif conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/CoreMIDI.h'):
     # this line is needed because scons can't handle -framework in ParseConfig() yet.
-    libraries['sysmidi'] = LibraryInfo (LINKFLAGS= '-framework CoreMIDI -framework CoreFoundation -framework CoreAudio -framework CoreServices -framework AudioUnit')
+    libraries['sysmidi'] = LibraryInfo (LINKFLAGS= '-framework CoreMIDI -framework CoreFoundation -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox -bind_at_load')
     env['SYSMIDI'] = 'CoreMIDI'
-    subst_dict['%MIDITAG%'] = "coremidi"
+    subst_dict['%MIDITAG%'] = "ardour"
     subst_dict['%MIDITYPE%'] = "coremidi"
 
 env = conf.Finish()
 
-if env['DEBIAN']:
-
-    libraries['soundtouch'] = LibraryInfo(LIBS='SoundTouch')
+if env['SYSLIBS']:
+
+    libraries['sigc2'] = LibraryInfo()
+    libraries['sigc2'].ParseConfig('pkg-config --cflags --libs sigc++-2.0')
+    libraries['glibmm2'] = LibraryInfo()
+    libraries['glibmm2'].ParseConfig('pkg-config --cflags --libs glibmm-2.4')
+    libraries['gdkmm2'] = LibraryInfo()
+    libraries['gdkmm2'].ParseConfig ('pkg-config --cflags --libs gdkmm-2.4')
+    libraries['gtkmm2'] = LibraryInfo()
+    libraries['gtkmm2'].ParseConfig ('pkg-config --cflags --libs gtkmm-2.4')
+    libraries['atkmm'] = LibraryInfo()
+    libraries['atkmm'].ParseConfig ('pkg-config --cflags --libs atkmm-1.6')
+    libraries['pangomm'] = LibraryInfo()
+    libraries['pangomm'].ParseConfig ('pkg-config --cflags --libs pangomm-1.4')
+    libraries['libgnomecanvasmm'] = LibraryInfo()
+    libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6')
+
+#    libraries['libglademm'] = LibraryInfo()
+#    libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
+
+#    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
+    libraries['soundtouch'] = LibraryInfo()
+    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
 
     coredirs = [
         'templates'
     ]
 
-    subdirs2 = [
-       'libs/cassowary',
+    subdirs = [
         'libs/pbd3',
-        'libs/midi++2'
+        'libs/midi++2',
+        'libs/ardour'
         ]
 
-    gtk2_subdirs = [
-        'libs/gtkmm2ext'
-         ]
-else:
+    gtk_subdirs = [
+#        'libs/flowcanvas',
+        'libs/gtkmm2ext',
+        'gtk2_ardour'
+        ]
 
+else:
     libraries['sigc2'] = LibraryInfo(LIBS='sigc++2',
                                     LIBPATH='#libs/sigc++2',
                                     CPPPATH='#libs/sigc++2')
@@ -440,48 +530,77 @@ else:
                                       LIBPATH='#libs/gtkmm2/gdk',
                                       CPPPATH='#libs/gtkmm2/gdk')
     libraries['gtkmm2'] = LibraryInfo(LIBS='gtkmm2',
-                                      LIBPATH='#libs/gtkmm2/gtk',
-                                      CPPPATH='#libs/gtkmm2/gtk')
+                                     LIBPATH="#libs/gtkmm2/gtk",
+                                     CPPPATH='#libs/gtkmm2/gtk/')
     libraries['libgnomecanvasmm'] = LibraryInfo(LIBS='libgnomecanvasmm',
                                                 LIBPATH='#libs/libgnomecanvasmm',
                                                 CPPPATH='#libs/libgnomecanvasmm')
+
     libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch',
                                           LIBPATH='#libs/soundtouch',
-                                          CPPPATH='#libs')
+                                          CPPPATH=['#libs', '#libs/soundtouch'])
+#    libraries['libglademm'] = LibraryInfo(LIBS='libglademm',
+#                                          LIBPATH='#libs/libglademm',
+#                                          CPPPATH='#libs/libglademm')
 
     coredirs = [
         'libs/soundtouch',
         'templates'
     ]
 
-    subdirs2 = [
-       'libs/cassowary',
+    subdirs = [
+#          'libs/cassowary',
         'libs/sigc++2',
         'libs/pbd3',
-        'libs/midi++2'
+        'libs/midi++2',
+        'libs/ardour'
         ]
 
-    gtk2_subdirs = [
-        'libs/glibmm2', 
-        'libs/gtkmm2/pango', 
-        'libs/gtkmm2/atk', 
-        'libs/gtkmm2/gdk', 
-        'libs/gtkmm2/gtk',
+    gtk_subdirs = [
+       'libs/glibmm2',
+       'libs/gtkmm2/pango',
+       'libs/gtkmm2/atk',
+       'libs/gtkmm2/gdk',
+       'libs/gtkmm2/gtk',
        'libs/libgnomecanvasmm',
-        'libs/gtkmm2ext'
+#      'libs/flowcanvas',
+    'libs/gtkmm2ext',
+    'gtk2_ardour'
         ]
+
+surface_subdirs = []
+
+if env['SURFACES']:
+    surface_subdirs += [ 'libs/surfaces/control_protocol', 'libs/surfaces/generic_midi' ]
+    if have_libusb:
+        surface_subdirs += [ 'libs/surfaces/tranzport' ]
+    if os.access ('libs/surfaces/sony9pin', os.F_OK):
+        surface_subdirs += [ 'libs/surfaces/sony9pin' ]
     
 opts.Save('scache.conf', env)
 Help(opts.GenerateHelpText(env))
 
 if os.environ.has_key('PATH'):
     env.Append(PATH = os.environ['PATH'])
+
 if os.environ.has_key('PKG_CONFIG_PATH'):
     env.Append(PKG_CONFIG_PATH = os.environ['PKG_CONFIG_PATH'])
 
+if os.environ.has_key('CC'):
+    env['CC'] = os.environ['CC']
+
+if os.environ.has_key('CXX'):
+    env['CXX'] = os.environ['CXX']
+
+if os.environ.has_key('DISTCC_HOSTS'):
+    env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS']
+    env['ENV']['HOME'] = os.environ['HOME']
+    
 final_prefix = '$PREFIX'
 install_prefix = '$DESTDIR/$PREFIX'
 
+subst_dict['INSTALL_PREFIX'] = install_prefix;
+
 if env['PREFIX'] == '/usr':
     final_config_prefix = '/etc'
 else:
@@ -489,47 +608,86 @@ else:
 
 config_prefix = '$DESTDIR' + final_config_prefix
 
+
+# SCons should really do this for us
+
+conf = Configure (env)
+
+have_cxx = conf.TryAction (Action (env['CXX'] + ' --version'))
+if have_cxx[0] != 1:
+    print "This system has no functional C++ compiler. You cannot build Ardour from source without one."
+    exit (1)
+else:
+    print "Congratulations, you have a functioning C++ compiler."
+    
+env = conf.Finish()
+
 #
 # Compiler flags and other system-dependent stuff
 #
 
 opt_flags = []
+debug_flags = [ '-g' ]
 
 # 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_cpu = 0
+config_arch = 1
+config_kernel = 2
+config_os = 3
 config = config_guess.split ("-")
 
-#
-# on OS X darwinports puts things in /opt/local by default
-#
-if config[config_arch] == 'apple':
-    libraries['core'].Append (LIBPATH = [ '/opt/local/lib' ],
-                              CPPPATH = [ '/opt/local/include' ])
+print "system triple: " + config_guess
+
+# Autodetect
+if env['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:
+            env['DIST_TARGET'] = 'panther'
+        else:
+            env['DIST_TARGET'] = 'tiger'
+    else:
+        if re.search ("x86_64", config[config_cpu]) != None:
+            env['DIST_TARGET'] = 'x86_64'
+        elif re.search("i[0-5]86", config[config_cpu]) != None:
+            env['DIST_TARGET'] = 'i386'
+        elif re.search("powerpc", config[config_cpu]) != None:
+            env['DIST_TARGET'] = 'powerpc'
+        else:
+            env['DIST_TARGET'] = 'i686'
+    print "\n*******************************"
+    print "detected DIST_TARGET = " + env['DIST_TARGET']
+    print "*******************************\n"
+
 
-if config[config_cpu] == 'powerpc':
+if config[config_cpu] == 'powerpc' and env['DIST_TARGET'] != 'none':
     #
     # Apple/PowerPC optimization options
     #
     # -mcpu=7450 does not reliably work with gcc 3.*
     #
-    if env['NOARCH'] == 0:
-        if env['ALTIVEC'] == 1:
-            opt_flags.extend ([ "-mcpu=7400", "-maltivec", "-mabi=altivec" ])
+    if env['DIST_TARGET'] == 'panther' or env['DIST_TARGET'] == 'tiger':
+        if config[config_arch] == 'apple':
+            opt_flags.extend ([ "-mcpu=7450", "-faltivec"])
         else:
-            opt_flags.extend([ "-mcpu=750", "-mmultiple" ])
-        opt_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"])
+            opt_flags.extend ([ "-mcpu=7400", "-maltivec", "-mabi=altivec"]) 
+    else:
+        opt_flags.extend([ "-mcpu=750", "-mmultiple" ])
+    opt_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"])
 
-elif re.search ("i[0-9]86", config[config_cpu]) != None :
+elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_64", config[config_cpu]) != None)) and env['DIST_TARGET'] != 'none':
 
-    if env['NOARCH'] == 0:
+    build_host_supports_sse = 0
+    
+    debug_flags.append ("-DARCH_X86")
+    opt_flags.append ("-DARCH_X86")
+
+    if config[config_kernel] == 'linux' :
 
-        if config[config_kernel] == 'linux' :
+        if env['DIST_TARGET'] != 'i386': 
 
             flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
             x86_flags = flag_line.split (": ")[1:][0].split (' ')
@@ -537,7 +695,7 @@ elif re.search ("i[0-9]86", config[config_cpu]) != None :
             if "mmx" in x86_flags:
                 opt_flags.append ("-mmmx")
             if "sse" in x86_flags:
-                opt_flags.extend (["-msse", "-mfpmath=sse"])
+                build_host_supports_sse = 1
             if "3dnow" in x86_flags:
                 opt_flags.append ("-m3dnow")
 
@@ -545,7 +703,28 @@ elif re.search ("i[0-9]86", config[config_cpu]) != None :
                 opt_flags.append ("-march=i586")
             elif config[config_cpu] == "i686":
                 opt_flags.append ("-march=i686")
-        
+
+    if ((env['DIST_TARGET'] == 'i686') or (env['DIST_TARGET'] == 'x86_64')) and build_host_supports_sse:
+        opt_flags.extend (["-msse", "-mfpmath=sse"])
+        debug_flags.extend (["-msse", "-mfpmath=sse"])
+# end of processor-specific section
+
+# optimization section
+if env['FPU_OPTIMIZATION']:
+    if env['DIST_TARGET'] == 'tiger':
+        opt_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS")
+        debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS")
+        libraries['core'].Append(LINKFLAGS= '-framework Accelerate')
+    elif env['DIST_TARGET'] == 'i686' or env['DIST_TARGET'] == 'x86_64':
+        opt_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
+        debug_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
+        if env['DIST_TARGET'] == 'x86_64':
+            opt_flags.append ("-DUSE_X86_64_ASM")
+            debug_flags.append ("-DUSE_X86_64_ASM")
+        if build_host_supports_sse != 1:
+            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)"
+# end optimization section
+
 #
 # ARCH="..." overrides all 
 #
@@ -565,7 +744,7 @@ opt_flags[:0] = [
     ]
 
 if env['DEBUG'] == 1:
-    env.Append(CCFLAGS="-g")
+    env.Append(CCFLAGS=" ".join (debug_flags))
 else:
     env.Append(CCFLAGS=" ".join (opt_flags))
 
@@ -587,16 +766,24 @@ env.Merge ([ libraries['core'] ])
 conf = Configure (env)
 
 if env['NLS']:
+    print 'Checking for internationalization support ...'
+    have_gettext = conf.TryAction(Action('xgettext --version'))
+    if have_gettext[0] != 1:
+        print 'This system is not configured for internationalized applications (no xgettext command). An english-only version will be built\n'
+        env['NLS'] = 0
+        
     if conf.CheckCHeader('libintl.h') == None:
-        print 'This system is not configured for internationalized applications. An english-only version will be built\n'
+        print 'This system is not configured for internationalized applications (no libintl.h). An english-only version will be built\n'
         env['NLS'] = 0
 
+
 env = conf.Finish()
 
 if env['NLS'] == 1:
     env.Append(CCFLAGS="-DENABLE_NLS")
 
-Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n version')
+
+Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n version subst_dict')
 
 #
 # the configuration file may be system dependent
@@ -605,16 +792,24 @@ Export('env install_prefix final_prefix config_prefix final_config_prefix librar
 conf = env.Configure ()
 
 if conf.CheckCHeader('/System/Library/Frameworks/CoreAudio.framework/Versions/A/Headers/CoreAudio.h'):
-    subst_dict['%JACK_BACKEND%'] = "coreaudio:Built-in Audio:in"
+    subst_dict['%JACK_INPUT%'] = "coreaudio:Built-in Audio:in"
+    subst_dict['%JACK_OUTPUT%'] = "coreaudio:Built-in Audio:out"
 else:
-    subst_dict['%JACK_BACKEND%'] = "alsa_pcm:playback_"
+    subst_dict['%JACK_INPUT%'] = "alsa_pcm:playback_"
+    subst_dict['%JACK_OUTPUT%'] = "alsa_pcm:capture_"
+
+# posix_memalign available
+if not conf.CheckFunc('posix_memalign'):
+    print 'Did not find posix_memalign(), using malloc'
+    env.Append(CCFLAGS='-DNO_POSIX_MEMALIGN')
+
 
 env = conf.Finish()
 
 rcbuild = env.SubstInFile ('ardour.rc','ardour.rc.in', SUBST_DICT = subst_dict)
 
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour'), 'ardour_system.rc'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour'), 'ardour.rc'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour_system.rc'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.rc'))
 
 Default (rcbuild)
 
@@ -657,10 +852,10 @@ env.AddPostAction (srcdist, Action ('rm -rf ' + str (File (env['DISTTREE']))))
 for subdir in coredirs:
     SConscript (subdir + '/SConscript')
 
-for sublistdir in [subdirs2, gtk2_subdirs]:
+for sublistdir in [subdirs, gtk_subdirs, surface_subdirs]:
     for subdir in sublistdir:
         SConscript (subdir + '/SConscript')
-
+            
 # cleanup
 env.Clean ('scrub', [ 'scache.conf', '.sconf_temp', '.sconsign.dblite', 'config.log'])