Fix deletion of VCA with slaved controls.

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 2f4cd10661a9e1514238508a3f13c7849d6d2828..86fcc53d5e9859f297ed6e258faa790112d371a0 100644 (file)
--- a/wscript
+++ b/wscript
@@ -239,7 +239,6 @@ children = [
         'libs/fst',
         'libs/vfork',
         'libs/ardouralsautil',
-        'cfgtool',
         'tools/luadevel',
 ]
 
@@ -287,10 +286,10 @@ def create_stored_revision():
 
 def get_depstack_rev(depstack_root):
     try:
-        with open(depstack_root + '/.vers', 'r') as f:
+        with open(depstack_root + '/../.vers', 'r') as f:
             return f.readline()
     except IOError:
-        return '';
+        return '-unknown-';
 
 def set_compiler_flags (conf,opt):
     #
@@ -545,12 +544,12 @@ int main() { return 0; }''',
                 ("-DMAC_OS_X_VERSION_MIN_REQUIRED=1070",
                  '-mmacosx-version-min=10.7'))
 
-    elif conf.env['build_target'] in [ 'mavericks', 'yosemite', 'el_capitan' ]:
+    elif conf.env['build_target'] in [ 'mavericks', 'yosemite' ]:
         compiler_flags.extend(
                 ("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
                  "-mmacosx-version-min=10.8"))
 
-    elif conf.env['build_target'] in [ 'sierra' ]:
+    elif conf.env['build_target'] in ['el_capitan', 'sierra' ]:
         compiler_flags.extend(
                 ("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
                  "-mmacosx-version-min=10.9"))
@@ -859,7 +858,7 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS',  [prefinclude ])
         conf.env.append_value('LINKFLAGS', [ preflib ])
         autowaf.display_msg(conf, 'Will build against private GTK dependency stack in ' + user_gtk_root, 'yes')
-        conf.env['DEPSTACK_REV'] = get_depstack_rev (user_gtk_root)
+        conf.env['DEPSTACK_REV'] = get_depstack_rev (Options.options.depstack_root)
     else:
         autowaf.display_msg(conf, 'Will build against private GTK dependency stack', 'no')
         conf.env['DEPSTACK_REV'] = '-system-'