* fixed segfault on MIDI Panic button

[ardour.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index d88e8989cbb4faae96e0ef46362e392952ee0d25..c5ab5f78b61d593fcb8d64e7c0ca9bbf9f0935d6 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -16,7 +16,7 @@ import SCons.Node.FS
 SConsignFile()
 EnsureSConsVersion(0, 96)
 
 SConsignFile()
 EnsureSConsVersion(0, 96)
 

-ardour_version = '2.1pre'
+ardour_version = '3.0'

 
 subst_dict = { }
 
 
 subst_dict = { }
 


@@ -27,14 +27,18 @@ subst_dict = { }
 opts = Options('scache.conf')
 opts.AddOptions(
     ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''),
 opts = Options('scache.conf')
 opts.AddOptions(
     ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''),

+    ('WINDOWS_KEY', 'Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key', 'Mod4'),

     BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0),
     BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0),
     BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0),
     BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0),

-    BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 1),
+    BoolOption('GTKOSX', 'Compile for use with GTK-OSX, not GTK-X11', 0),
+    BoolOption('NATIVE_OSX_KEYS', 'Build key bindings file that matches OS X conventions', 0),
+    BoolOption('OLDFONTS', 'Old school font sizes', 0),
+    BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0),

     PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'),
     PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'),

-    EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2),
+    EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'leopard', 'none' ), ignorecase=2),

     BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0),
     BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic.  Might break compilation.  For pedants', 0),
     BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0),
     BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic.  Might break compilation.  For pedants', 0),

-    BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0),
+    BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 1),

     BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
     BoolOption('LIBLO', 'Compile with support for liblo library', 1),
     BoolOption('NLS', 'Set to turn on i18n support', 1),
     BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
     BoolOption('LIBLO', 'Compile with support for liblo library', 1),
     BoolOption('NLS', 'Set to turn on i18n support', 1),


@@ -44,9 +48,10 @@ opts.AddOptions(
     BoolOption('UNIVERSAL', 'Compile as universal binary.  Requires that external libraries are already universal.', 0),
     BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0),
     BoolOption('VST', 'Compile with support for VST', 0),
     BoolOption('UNIVERSAL', 'Compile as universal binary.  Requires that external libraries are already universal.', 0),
     BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0),
     BoolOption('VST', 'Compile with support for VST', 0),

+    BoolOption('LV2', 'Compile with support for LV2 (if slv2 is available)', 1),

     BoolOption('GPROFILE', 'Compile with support for gprofile (Developers only)', 0),
     BoolOption('GPROFILE', 'Compile with support for gprofile (Developers only)', 0),

-    BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1),
-    BoolOption('CMT', 'Compile with support for CMT Additions', 1)
+    BoolOption('FREEDESKTOP', 'Install MIME type, icons and .desktop file as per the freedesktop.org spec (requires xdg-utils and shared-mime-info). "scons uninstall" removes associations in desktop database', 0),
+    BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1)

 )
 
 #----------------------------------------------------------------------
 )
 
 #----------------------------------------------------------------------


@@ -64,6 +69,7 @@ class LibraryInfo(Environment):
             self.Append (LIBPATH = other.get ('LIBPATH', []))
             self.Append (CPPPATH = other.get('CPPPATH', []))
             self.Append (LINKFLAGS = other.get('LINKFLAGS', []))
             self.Append (LIBPATH = other.get ('LIBPATH', []))
             self.Append (CPPPATH = other.get('CPPPATH', []))
             self.Append (LINKFLAGS = other.get('LINKFLAGS', []))

+            self.Append (CCFLAGS = other.get('CCFLAGS', []))

        self.Replace(LIBPATH = list(Set(self.get('LIBPATH', []))))
        self.Replace(CPPPATH = list(Set(self.get('CPPPATH',[]))))
         #doing LINKFLAGS breaks -framework
        self.Replace(LIBPATH = list(Set(self.get('LIBPATH', []))))
        self.Replace(CPPPATH = list(Set(self.get('CPPPATH',[]))))
         #doing LINKFLAGS breaks -framework


@@ -229,6 +235,7 @@ def i18n (buildenv, sources, installenv):
         buildenv.PoBuild(po_file, ['po/'+po_file, potfile])
         mo_file = po_file.replace (".po", ".mo")
         installenv.Alias ('install', buildenv.MoBuild (mo_file, po_file))
         buildenv.PoBuild(po_file, ['po/'+po_file, potfile])
         mo_file = po_file.replace (".po", ".mo")
         installenv.Alias ('install', buildenv.MoBuild (mo_file, po_file))

+        installenv.Alias ('msgupdate', buildenv.MoBuild (mo_file, po_file))

     
     for lang in languages:
         modir = (os.path.join (install_prefix, 'share/locale/' + lang + '/LC_MESSAGES/'))
     
     for lang in languages:
         modir = (os.path.join (install_prefix, 'share/locale/' + lang + '/LC_MESSAGES/'))


@@ -361,7 +368,7 @@ def distcopy (target, source, env):
     return p.close ()
 
 def tarballer (target, source, env):
     return p.close ()
 
 def tarballer (target, source, env):

-    cmd = 'tar -jcf ' + str (target[0]) +  ' ' + str(source[0]) + "  --exclude '*~'"
+    cmd = 'tar -jcf ' + str (target[0]) +  ' ' + str(source[0]) + "  --exclude '*~'" + " --exclude .svn --exclude '.svn/*'"

     print 'running ', cmd, ' ... '
     p = os.popen (cmd)
     return p.close ()
     print 'running ', cmd, ' ... '
     p = os.popen (cmd)
     return p.close ()


@@ -400,6 +407,28 @@ else:
     if os.path.isfile('.personal_use_only'):
         os.remove('.personal_use_only')
 
     if os.path.isfile('.personal_use_only'):
         os.remove('.personal_use_only')
 

+####################
+# push environment
+####################
+
+def pushEnvironment(context):
+    if os.environ.has_key('PATH'):
+       context.Append(PATH = os.environ['PATH'])
+       
+    if os.environ.has_key('PKG_CONFIG_PATH'):
+       context.Append(PKG_CONFIG_PATH = os.environ['PKG_CONFIG_PATH'])
+           
+    if os.environ.has_key('CC'):
+       context['CC'] = os.environ['CC']
+               
+    if os.environ.has_key('CXX'):
+       context['CXX'] = os.environ['CXX']
+
+    if os.environ.has_key('DISTCC_HOSTS'):
+       context['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS']
+       context['ENV']['HOME'] = os.environ['HOME']
+
+pushEnvironment (env)

 
 #######################
 # Dependency Checking #
 
 #######################
 # Dependency Checking #


@@ -414,7 +443,7 @@ deps = \
        'samplerate'           : '0.1.0',
        'raptor'               : '1.4.2',
        'lrdf'                 : '0.4.0',
        'samplerate'           : '0.1.0',
        'raptor'               : '1.4.2',
        'lrdf'                 : '0.4.0',

-       'jack'                 : '0.105.0',
+       'jack'                 : '0.109.0',

        'libgnomecanvas-2.0'   : '2.0'
 }
 
        'libgnomecanvas-2.0'   : '2.0'
 }
 


@@ -423,16 +452,22 @@ def DependenciesRequiredMessage():
        print 'Please consult http://ardour.org/building for more information'
 
 def CheckPKGConfig(context, version):
        print 'Please consult http://ardour.org/building for more information'
 
 def CheckPKGConfig(context, version):

-     context.Message( 'Checking for pkg-config version >= %s... ' %version )
-     ret = context.TryAction('pkg-config --atleast-pkgconfig-version=%s' % version)[0]
-     context.Result( ret )
-     return ret
+    context.Message( 'Checking for pkg-config version >= %s... ' %version )
+    ret = context.TryAction('pkg-config --atleast-pkgconfig-version=%s' % version)[0]
+    context.Result( ret )
+    return ret

 
 def CheckPKGVersion(context, name, version):
 
 def CheckPKGVersion(context, name, version):

-     context.Message( 'Checking for %s... ' % name )
-     ret = context.TryAction('pkg-config --atleast-version=%s %s' %(version,name) )[0]
-     context.Result( ret )
-     return ret
+    context.Message( 'Checking for %s... ' % name )
+    ret = context.TryAction('pkg-config --atleast-version=%s %s' %(version,name) )[0]
+    context.Result( ret )
+    return ret
+
+def CheckPKGExists(context, name):
+    context.Message ('Checking for %s...' % name)
+    ret = context.TryAction('pkg-config --exists %s' % name)[0]
+    context.Result (ret)
+    return ret

 
 conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig,
                                        'CheckPKGVersion' : CheckPKGVersion })
 
 conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig,
                                        'CheckPKGVersion' : CheckPKGVersion })


@@ -472,16 +507,46 @@ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor')
 libraries['samplerate'] = LibraryInfo()
 libraries['samplerate'].ParseConfig('pkg-config --cflags --libs samplerate')
 
 libraries['samplerate'] = LibraryInfo()
 libraries['samplerate'].ParseConfig('pkg-config --cflags --libs samplerate')
 

+conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } )
+
+if conf.CheckPKGExists ('fftw3f'):
+    libraries['fftw3f'] = LibraryInfo()
+    libraries['fftw3f'].ParseConfig('pkg-config --cflags --libs fftw3f')
+
+if conf.CheckPKGExists ('fftw3'):
+    libraries['fftw3'] = LibraryInfo()
+    libraries['fftw3'].ParseConfig('pkg-config --cflags --libs fftw3')
+
+env = conf.Finish ()
+

 if env['FFT_ANALYSIS']:
 if env['FFT_ANALYSIS']:

-       libraries['fftw3f'] = LibraryInfo()
-       libraries['fftw3f'].ParseConfig('pkg-config --cflags --libs fftw3f')

         #
         # Check for fftw3 header as well as the library
         #
         # Check for fftw3 header as well as the library

-        conf = Configure (libraries['fftw3f'])
+        #
+
+        conf = Configure(libraries['fftw3'])
+

         if conf.CheckHeader ('fftw3.h') == False:
         if conf.CheckHeader ('fftw3.h') == False:

-                print "FFT Analysis cannot be compiled without the FFTW3 headers, which don't seem to be installed"
-                sys.exit (1)
-        libraries['fftw3f'] = conf.Finish();
+            print ('Ardour cannot be compiled without the FFTW3 headers, which do not seem to be installed')
+            sys.exit (1)            
+        conf.Finish()
+
+if env['LV2']:
+       conf = env.Configure(custom_tests = { 'CheckPKGExists' : CheckPKGExists })
+       
+       if conf.CheckPKGExists ('slv2'):
+               libraries['slv2'] = LibraryInfo()
+               libraries['slv2'].ParseConfig('pkg-config --cflags --libs slv2')
+                env.Append (CCFLAGS="-DHAVE_LV2")
+       else:
+               print 'Building Ardour with LV2 support requires SLV2 >= 0.6.0'
+               print 'WARNING: SLV2 not found, or too old.  Ardour will be built without LV2 support.'
+               print 'Until the 2.4 release, Ardour requires SLV2 out of SVN.'
+               print 'Testing would be very much appreciated!  svn co http://svn.drobilla.net/lad/slv2'
+               env['LV2'] = 0
+       conf.Finish()
+else:
+       print 'LV2 support is not enabled.  Build with \'scons LV2=1\' to enable.'

 
 libraries['jack'] = LibraryInfo()
 libraries['jack'].ParseConfig('pkg-config --cflags --libs jack')
 
 libraries['jack'] = LibraryInfo()
 libraries['jack'].ParseConfig('pkg-config --cflags --libs jack')


@@ -498,6 +563,9 @@ libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0')
 libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gmodule-2.0')
 libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gthread-2.0')
 
 libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gmodule-2.0')
 libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gthread-2.0')
 

+libraries['freetype2'] = LibraryInfo()
+libraries['freetype2'].ParseConfig ('pkg-config --cflags --libs freetype2')
+

 libraries['gtk2'] = LibraryInfo()
 libraries['gtk2'].ParseConfig ('pkg-config --cflags --libs gtk+-2.0')
 
 libraries['gtk2'] = LibraryInfo()
 libraries['gtk2'].ParseConfig ('pkg-config --cflags --libs gtk+-2.0')
 


@@ -524,7 +592,7 @@ libraries['gtkmm2ext'] = LibraryInfo (LIBS='gtkmm2ext', LIBPATH='#libs/gtkmm2ext
 
 # SCons should really do this for us
 
 
 # SCons should really do this for us
 

-conf = Configure (env)
+conf = env.Configure ()

 
 have_cxx = conf.TryAction (Action (str(env['CXX']) + ' --version'))
 if have_cxx[0] != 1:
 
 have_cxx = conf.TryAction (Action (str(env['CXX']) + ' --version'))
 if have_cxx[0] != 1:


@@ -564,8 +632,10 @@ if env['DIST_TARGET'] == 'auto':
         # 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'
         # 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:
+        if re.search ("darwin8[.]", config[config_kernel]) != None:

             env['DIST_TARGET'] = 'tiger'
             env['DIST_TARGET'] = 'tiger'

+        else:
+            env['DIST_TARGET'] = 'leopard'

     else:
         if re.search ("x86_64", config[config_cpu]) != None:
             env['DIST_TARGET'] = 'x86_64'
     else:
         if re.search ("x86_64", config[config_cpu]) != None:
             env['DIST_TARGET'] = 'x86_64'


@@ -631,9 +701,9 @@ elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_6
 
 # optimization section
 if env['FPU_OPTIMIZATION']:
 
 # optimization section
 if env['FPU_OPTIMIZATION']:

-    if env['DIST_TARGET'] == 'tiger':
-        opt_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS")
-        debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS")
+    if env['DIST_TARGET'] == 'tiger' or env['DIST_TARGET'] == 'leopard':
+        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")
         libraries['core'].Append(LINKFLAGS= '-framework Accelerate')
     elif env['DIST_TARGET'] == 'i686' or env['DIST_TARGET'] == 'x86_64':
         opt_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")


@@ -652,6 +722,18 @@ if env['DIST_TARGET'] == 'x86_64':
 else:
     env['LIBDIR']='lib'
 
 else:
     env['LIBDIR']='lib'
 

+#
+# a single way to test if we're on OS X
+#
+
+if env['DIST_TARGET'] in ['panther', 'tiger', 'leopard' ]:
+    env['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.
+    env.Append (CCFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040")
+else:
+    env['IS_OSX'] = 0
+

 #
 # save off guessed arch element in an env
 #
 #
 # save off guessed arch element in an env
 #


@@ -710,11 +792,52 @@ if env['LIBLO']:
 
 
 def prep_libcheck(topenv, libinfo):
 
 
 def prep_libcheck(topenv, libinfo):

-    if topenv['DIST_TARGET'] == 'panther' or topenv['DIST_TARGET'] == 'tiger':
-        libinfo.Append(CCFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib")
+    if topenv['IS_OSX']:
+       #
+       # rationale: GTK-Quartz uses jhbuild and installs to /opt/gtk by default.
+       #            All libraries needed should be built against this location
+       if topenv['GTKOSX']:
+               libinfo.Append(CPPPATH="/opt/gtk/include", LIBPATH="/opt/gtk/lib")
+               libinfo.Append(CXXFLAGS="-I/opt/gtk/include", LINKFLAGS="-L/opt/gtk/lib")
+       libinfo.Append(CPPPATH="/opt/local/include", LIBPATH="/opt/local/lib")
+       libinfo.Append(CXXFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib")

 
 prep_libcheck(env, env)
 
 
 prep_libcheck(env, env)
 

+
+#
+# these are part of the Ardour source tree because they are C++
+# 
+
+libraries['vamp'] = LibraryInfo (LIBS='vampsdk',
+                                 LIBPATH='#libs/vamp-sdk',
+                                 CPPPATH='#libs/vamp-sdk')
+libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk',
+                                 LIBPATH='#libs/vamp-sdk',
+                                 CPPPATH='#libs/vamp-sdk')
+
+env['RUBBERBAND'] = False
+
+#conf = Configure (env)
+#
+#if conf.CheckHeader ('fftw3.h'):
+#    env['RUBBERBAND'] = True
+#    libraries['rubberband'] = LibraryInfo (LIBS='rubberband',
+#                                           LIBPATH='#libs/rubberband',
+#                                           CPPPATH='#libs/rubberband',
+#                                           CCFLAGS='-DUSE_RUBBERBAND')
+#else:
+#    print ""
+#    print "-------------------------------------------------------------------------"
+#    print "You do not have the FFTW single-precision development package installed."
+#    print "This prevents Ardour from using the Rubberband library for timestretching"
+#    print "and pitchshifting. It will fall back on SoundTouch for timestretch, and "
+#    print "pitchshifting will not be available."
+#    print "-------------------------------------------------------------------------"
+#    print ""
+#
+#conf.Finish()
+

 #
 # Check for libusb
 
 #
 # Check for libusb
 


@@ -740,7 +863,7 @@ libraries['usb'] = conf.Finish ()
 
 libraries['flac'] = LibraryInfo ()
 prep_libcheck(env, libraries['flac'])
 
 libraries['flac'] = LibraryInfo ()
 prep_libcheck(env, libraries['flac'])

-libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib")
+libraries['flac'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib")

 
 #
 # june 1st 2007: look for a function that is in FLAC 1.1.2 and not in later versions
 
 #
 # june 1st 2007: look for a function that is in FLAC 1.1.2 and not in later versions


@@ -749,12 +872,14 @@ libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local
 #
 
 conf = Configure (libraries['flac'])
 #
 
 conf = Configure (libraries['flac'])

-if conf.CheckLib ('FLAC', 'FLAC__seekable_stream_decoder_set_read_callback', language='CXX'):
+if conf.CheckLib ('FLAC', 'FLAC__seekable_stream_decoder_init', language='CXX'):

     conf.env.Append(CCFLAGS='-DHAVE_FLAC')
     use_flac = True
 else:
     use_flac = False
     conf.env.Append(CCFLAGS='-DHAVE_FLAC')
     use_flac = True
 else:
     use_flac = False

+    

 libraries['flac'] = conf.Finish ()
 libraries['flac'] = conf.Finish ()

+

 # or if that fails...
 #libraries['flac']    = LibraryInfo (LIBS='FLAC')
 
 # or if that fails...
 #libraries['flac']    = LibraryInfo (LIBS='FLAC')
 


@@ -762,7 +887,7 @@ libraries['flac'] = conf.Finish ()
 
 libraries['boost'] = LibraryInfo ()
 prep_libcheck(env, libraries['boost'])
 
 libraries['boost'] = LibraryInfo ()
 prep_libcheck(env, libraries['boost'])

-libraries['boost'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib")
+libraries['boost'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib")

 conf = Configure (libraries['boost'])
 if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == False:
         print "Boost header files do not appear to be installed."
 conf = Configure (libraries['boost'])
 if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == False:
         print "Boost header files do not appear to be installed."


@@ -802,11 +927,38 @@ else:
 
 libraries['dmalloc'] = conf.Finish ()
 
 
 libraries['dmalloc'] = conf.Finish ()
 

+#
+# ensure FREEDESKTOP target is doable..
+#
+
+conf = env.Configure ()
+if env['FREEDESKTOP']:
+       have_update_mime_database = conf.TryAction (Action ('update-mime-database -v'))
+       if have_update_mime_database[0] != 1:
+               print "Warning. You have no update-mime-database command in your PATH. FREEDESKTOP is now disabled."
+               env['FREEDESKTOP'] = 0
+       have_gtk_update_icon_cache = conf.TryAction (Action ('gtk-update-icon-cache -?'))
+       if have_gtk_update_icon_cache[0] != 1:
+               print "Warning. You have no gtk-update-icon-cache command in your PATH. FREEDESKTOP is now disabled."
+               env['FREEDESKTOP'] = 0
+       have_update_desktop_database = conf.TryAction (Action ('update-desktop-database -?'))
+       if have_update_desktop_database[0] != 1:
+               print "Warning. You have no update-desktop-database command in your PATH. FREEDESKTOP is now disabled."
+               env['FREEDESKTOP'] = 0
+env = conf.Finish()
+

 #
 # Audio/MIDI library (needed for MIDI, since audio is all handled via JACK)
 #
 
 conf = Configure(env)
 #
 # Audio/MIDI library (needed for MIDI, since audio is all handled via JACK)
 #
 
 conf = Configure(env)

+    
+# ALSA, for engine dialog
+libraries['asound'] = LibraryInfo ()
+
+if conf.CheckCHeader('alsa/asoundlib.h'):
+    libraries['asound'] = LibraryInfo (LIBS='asound')
+

 if conf.CheckCHeader('jack/midiport.h'):
     libraries['sysmidi'] = LibraryInfo (LIBS='jack')
     env['SYSMIDI'] = 'JACK MIDI'
 if conf.CheckCHeader('jack/midiport.h'):
     libraries['sysmidi'] = LibraryInfo (LIBS='jack')
     env['SYSMIDI'] = 'JACK MIDI'


@@ -821,11 +973,16 @@ elif conf.CheckCHeader('alsa/asoundlib.h'):
     print "Using ALSA MIDI"
 elif conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/CoreMIDI.h'):
     # this line is needed because scons can't handle -framework in ParseConfig() yet.
     print "Using ALSA MIDI"
 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 -framework AudioToolbox -bind_at_load')
+    if env['GTKOSX']:
+        # We need Carbon as well as the rest
+        libraries['sysmidi'] = LibraryInfo (
+               LINKFLAGS = ' -framework CoreMIDI -framework CoreFoundation -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox -framework Carbon -bind_at_load' )
+    else:
+        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%'] = "ardour"
     subst_dict['%MIDITYPE%'] = "coremidi"
     env['SYSMIDI'] = 'CoreMIDI'
     subst_dict['%MIDITAG%'] = "ardour"
     subst_dict['%MIDITYPE%'] = "coremidi"

-    print "Using CoreMIDI"

 else:
     print "It appears you don't have the required MIDI libraries installed. For Linux this means you are missing the development package for ALSA libraries."
     sys.exit (1)
 else:
     print "It appears you don't have the required MIDI libraries installed. For Linux this means you are missing the development package for ALSA libraries."
     sys.exit (1)


@@ -849,13 +1006,15 @@ if env['SYSLIBS']:
             print '%s >= %s not found.' %(pkg, version)
             DependenciesRequiredMessage()
             Exit(1)
             print '%s >= %s not found.' %(pkg, version)
             DependenciesRequiredMessage()
             Exit(1)

-       
+    

     env = conf.Finish()
     
     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')
     env = conf.Finish()
     
     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['cairo'] = LibraryInfo()
+    libraries['cairo'].ParseConfig('pkg-config --cflags --libs cairo')

     libraries['cairomm'] = LibraryInfo()
     libraries['cairomm'].ParseConfig('pkg-config --cflags --libs cairomm-1.0')
     libraries['gdkmm2'] = LibraryInfo()
     libraries['cairomm'] = LibraryInfo()
     libraries['cairomm'].ParseConfig('pkg-config --cflags --libs cairomm-1.0')
     libraries['gdkmm2'] = LibraryInfo()


@@ -882,9 +1041,9 @@ if env['SYSLIBS']:
 
 #    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
     libraries['soundtouch'] = LibraryInfo()
 
 #    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
     libraries['soundtouch'] = LibraryInfo()

-    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
+    #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')

     # Comment the previous line and uncomment this for Debian:
     # Comment the previous line and uncomment this for Debian:

-    #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
+    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')

 
     libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
                                             LIBPATH='#libs/appleutility',
 
     libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
                                             LIBPATH='#libs/appleutility',


@@ -899,6 +1058,8 @@ if env['SYSLIBS']:
         'libs/pbd',
         'libs/midi++2',
         'libs/ardour',
         'libs/pbd',
         'libs/midi++2',
         'libs/ardour',

+        'libs/vamp-sdk',
+        'libs/vamp-plugins/',

     # these are unconditionally included but have
     # tests internally to avoid compilation etc
     # if VST is not set
     # these are unconditionally included but have
     # tests internally to avoid compilation etc
     # if VST is not set


@@ -918,18 +1079,27 @@ if env['SYSLIBS']:
         ]
 
 else:
         ]
 
 else:

+    libraries['cairo'] = LibraryInfo()
+    libraries['cairo'].ParseConfig('pkg-config --cflags --libs cairo')
+    
+    libraries['gtk2-unix-print'] = LibraryInfo()
+    libraries['gtk2-unix-print'].ParseConfig('pkg-config --cflags --libs gtk+-unix-print-2.0')
+    

     libraries['sigc2'] = LibraryInfo(LIBS='sigc++2',
                                     LIBPATH='#libs/sigc++2',
                                     CPPPATH='#libs/sigc++2')
     libraries['glibmm2'] = LibraryInfo(LIBS='glibmm2',
                                     LIBPATH='#libs/glibmm2',
     libraries['sigc2'] = LibraryInfo(LIBS='sigc++2',
                                     LIBPATH='#libs/sigc++2',
                                     CPPPATH='#libs/sigc++2')
     libraries['glibmm2'] = LibraryInfo(LIBS='glibmm2',
                                     LIBPATH='#libs/glibmm2',

-                                    CPPPATH='#libs/glibmm2')
+                                    CPPPATH='#libs/glibmm2/glib')

     libraries['pangomm'] = LibraryInfo(LIBS='pangomm',
                                     LIBPATH='#libs/gtkmm2/pango',
                                     CPPPATH='#libs/gtkmm2/pango')
     libraries['atkmm'] = LibraryInfo(LIBS='atkmm',
                                      LIBPATH='#libs/gtkmm2/atk',
                                      CPPPATH='#libs/gtkmm2/atk')
     libraries['pangomm'] = LibraryInfo(LIBS='pangomm',
                                     LIBPATH='#libs/gtkmm2/pango',
                                     CPPPATH='#libs/gtkmm2/pango')
     libraries['atkmm'] = LibraryInfo(LIBS='atkmm',
                                      LIBPATH='#libs/gtkmm2/atk',
                                      CPPPATH='#libs/gtkmm2/atk')

+    libraries['cairomm'] = LibraryInfo(LIBS='cairomm',
+                                      LIBPATH='#libs/cairomm',
+                                      CPPPATH='#libs/cairomm')

     libraries['gdkmm2'] = LibraryInfo(LIBS='gdkmm2',
                                       LIBPATH='#libs/gtkmm2/gdk',
                                       CPPPATH='#libs/gtkmm2/gdk')
     libraries['gdkmm2'] = LibraryInfo(LIBS='gdkmm2',
                                       LIBPATH='#libs/gtkmm2/gdk',
                                       CPPPATH='#libs/gtkmm2/gdk')


@@ -954,7 +1124,6 @@ else:
                                             CPPPATH='#libs/appleutility')
 
     coredirs = [
                                             CPPPATH='#libs/appleutility')
 
     coredirs = [

-        'libs/soundtouch',

         'templates'
     ]
     
         'templates'
     ]
     


@@ -964,6 +1133,8 @@ else:
         'libs/pbd',
         'libs/midi++2',
         'libs/ardour',
         'libs/pbd',
         'libs/midi++2',
         'libs/ardour',

+        'libs/vamp-sdk',
+        'libs/vamp-plugins/',

     # these are unconditionally included but have
     # tests internally to avoid compilation etc
     # if VST is not set
     # these are unconditionally included but have
     # tests internally to avoid compilation etc
     # if VST is not set


@@ -976,16 +1147,16 @@ else:
         ]
     
     gtk_subdirs = [
         ]
     
     gtk_subdirs = [

-       'libs/glibmm2',
-       'libs/gtkmm2/pango',
-       'libs/gtkmm2/atk',
-       'libs/gtkmm2/gdk',
-       'libs/gtkmm2/gtk',
-       'libs/libgnomecanvasmm',
-#      'libs/flowcanvas',
+        'libs/glibmm2',
+        'libs/gtkmm2/pango',
+        'libs/gtkmm2/atk',
+        'libs/gtkmm2/gdk',
+        'libs/gtkmm2/gtk',
+        'libs/libgnomecanvasmm',

         'libs/gtkmm2ext',
         'gtk2_ardour',
         'libs/gtkmm2ext',
         'gtk2_ardour',

-        'libs/clearlooks'
+        'libs/clearlooks',
+        'libs/cairomm'

         ]
 
 #
         ]
 
 #


@@ -1021,24 +1192,16 @@ else:
     env['POWERMATE'] = 0
     env['TRANZPORT'] = 0
 
     env['POWERMATE'] = 0
     env['TRANZPORT'] = 0
 

-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']
+#
+# timestretch libraries
+#

 
 

-if os.environ.has_key('CXX'):
-    env['CXX'] = os.environ['CXX']
+timefx_subdirs = ['libs/soundtouch']
+#if env['RUBBERBAND']:
+#    timefx_subdirs += ['libs/rubberband']

 
 

-if os.environ.has_key('DISTCC_HOSTS'):
-    env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS']
-    env['ENV']['HOME'] = os.environ['HOME']
+opts.Save('scache.conf', env)
+Help(opts.GenerateHelpText(env))

 
 final_prefix = '$PREFIX'
 
 
 final_prefix = '$PREFIX'
 


@@ -1058,14 +1221,6 @@ else:
 
 config_prefix = '$DESTDIR' + final_config_prefix
 
 
 config_prefix = '$DESTDIR' + final_config_prefix
 

-# For colorgcc
-if os.environ.has_key('PATH'):
-       env['PATH'] = os.environ['PATH']
-if os.environ.has_key('TERM'):
-       env['TERM'] = os.environ['TERM']
-if os.environ.has_key('HOME'):
-       env['HOME'] = os.environ['HOME']
-

 #
 # everybody needs this
 #
 #
 # everybody needs this
 #


@@ -1120,8 +1275,8 @@ if conf.CheckCHeader('/System/Library/Frameworks/CoreAudio.framework/Versions/A/
     subst_dict['%JACK_INPUT%'] = "coreaudio:Built-in Audio:in"
     subst_dict['%JACK_OUTPUT%'] = "coreaudio:Built-in Audio:out"
 else:
     subst_dict['%JACK_INPUT%'] = "coreaudio:Built-in Audio:in"
     subst_dict['%JACK_OUTPUT%'] = "coreaudio:Built-in Audio:out"
 else:

-    subst_dict['%JACK_INPUT%'] = "system:playback_"
-    subst_dict['%JACK_OUTPUT%'] = "system:capture_"
+    subst_dict['%JACK_INPUT%'] = "alsa_pcm:playback_"
+    subst_dict['%JACK_OUTPUT%'] = "alsa_pcm:capture_"

 
 # posix_memalign available
 if not conf.CheckFunc('posix_memalign'):
 
 # posix_memalign available
 if not conf.CheckFunc('posix_memalign'):


@@ -1146,9 +1301,15 @@ if os.path.exists('.svn'):
 # specbuild = env.SubstInFile ('ardour.spec','ardour.spec.in', SUBST_DICT = subst_dict)
 
 the_revision = env.Command ('frobnicatory_decoy', [], create_stored_revision)
 # specbuild = env.SubstInFile ('ardour.spec','ardour.spec.in', SUBST_DICT = subst_dict)
 
 the_revision = env.Command ('frobnicatory_decoy', [], create_stored_revision)

+remove_ardour = env.Command ('frobnicatory_decoy2', [],
+                             [ Delete ('$PREFIX/etc/ardour3'),
+                               Delete ('$PREFIX/lib/ardour3'),
+                               Delete ('$PREFIX/bin/ardour3'),
+                               Delete ('$PREFIX/share/ardour3')])

 
 env.Alias('revision', the_revision)
 
 env.Alias('revision', the_revision)

-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour_system.rc'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour_system.rc'))
+env.Alias('uninstall', remove_ardour)

 
 Default (sysrcbuild)
 
 
 Default (sysrcbuild)
 


@@ -1197,7 +1358,7 @@ env.AddPostAction (srcdist, Action ('rm -rf ' + str (File (env['DISTTREE']))))
 for subdir in coredirs:
     SConscript (subdir + '/SConscript')
 
 for subdir in coredirs:
     SConscript (subdir + '/SConscript')
 

-for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs ]:
+for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs ]:

     for subdir in sublistdir:
         SConscript (subdir + '/SConscript')
 
     for subdir in sublistdir:
         SConscript (subdir + '/SConscript')