(2) debugging region splitting with nowhiskey_

[ardour.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 5f9c13f090eb96db1d815e1d1d79fae3e40e5530..d4aab6f04f2e8f8df49319cd56afcf78ba71cc32 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -1,7 +1,7 @@
 # -*- python -*-
 
 #
-# just debugging svn bot now with extra wholesome loggy goodness
+# and there we have it, or do we?
 #
 
 import os
@@ -20,7 +20,7 @@ import SCons.Node.FS
 SConsignFile()
 EnsureSConsVersion(0, 96)
 
-ardour_version = '2.4'
+ardour_version = '2.4.1'
 
 subst_dict = { }
 
@@ -57,7 +57,9 @@ opts.AddOptions(
     BoolOption('LV2', 'Compile with support for LV2 (if slv2 is available)', 0),
     BoolOption('GPROFILE', 'Compile with support for gprofile (Developers only)', 0),
     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)
+    BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1),
+    BoolOption('AUBIO', "Use Paul Brossier's aubio library for feature detection (if available)", 1)
+    
 )
 
 #----------------------------------------------------------------------
@@ -450,7 +452,8 @@ deps = \
        'raptor'               : '1.4.2',
        'lrdf'                 : '0.4.0',
        'jack'                 : '0.101.1',
-       'libgnomecanvas-2.0'   : '2.0'
+       'libgnomecanvas-2.0'   : '2.0',
+        'aubio'                : '0.3.2'
 }
 
 def DependenciesRequiredMessage():
@@ -523,6 +526,10 @@ if conf.CheckPKGExists ('fftw3'):
     libraries['fftw3'] = LibraryInfo()
     libraries['fftw3'].ParseConfig('pkg-config --cflags --libs fftw3')
 
+if conf.CheckPKGExists ('aubio'):
+    libraries['aubio'] = LibraryInfo()
+    libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
+
 env = conf.Finish ()
 
 if env['FFT_ANALYSIS']:
@@ -537,6 +544,18 @@ if env['FFT_ANALYSIS']:
             sys.exit (1)            
         conf.Finish()
 
+if env['AUBIO']:
+        #
+        # Check for aubio header as well as the library
+        #
+
+        conf = Configure(libraries['aubio'])
+
+        if conf.CheckHeader ('aubio/aubio.h') == False:
+            print ('AUBIO-related features be compiled without the aubio headers, which do not seem to be installed')
+            env['AUBIO'] = 0
+        conf.Finish()
+
 if env['FREESOUND']:
         #
         # Check for curl header as well as the library
@@ -918,7 +937,7 @@ prep_libcheck(env, libraries['boost'])
 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."
+        print "Boost header files do not appear to be installed. You also might be running a buggy version of scons. Try scons 0.97 if you can."
         sys.exit (1)
     
 libraries['boost'] = conf.Finish ()