xfades in combined regions seem to work

[ardour.git] / wscript

diff --git a/wscript b/wscript
index a41a9358f01404673d5df1f1e002b74c65cd83f1..9f1ecb9802e92a84a6f9acb6c408e4464467c9d4 100644 (file)
--- a/wscript
+++ b/wscript
@@ -52,8 +52,8 @@ 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()
 
-def fetch_gcc_version ():
-    cmd = "LANG= gcc --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('.')
@@ -415,7 +415,7 @@ def configure(conf):
     autowaf.configure(conf)
     autowaf.display_header('Ardour Configuration')
 
-    gcc_versions = fetch_gcc_version()
+    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')
@@ -533,7 +533,7 @@ def configure(conf):
     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, 'LV2 Support', bool(conf.env['LV2_SUPPORT']))
     autowaf.display_msg(conf, 'LV2 UI Embedding', bool(conf.env['HAVE_SUIL']))
     autowaf.display_msg(conf, 'OGG', bool(conf.env['HAVE_OGG']))
     autowaf.display_msg(conf, 'Rubberband', bool(conf.env['HAVE_RUBBERBAND']))