X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=a1124f42f67362ff66650e7948a7d62de4f1c5dd;hb=1ef17e58134247d8de5d00a83da3a1009cec641d;hp=4e97d480a331759c962ee9c890e1bb25926a4f5f;hpb=5f6d8aded3c8696ea143e76e5078abadc8684afb;p=ardour.git

diff --git a/wscript b/wscript
index 4e97d480a3..a1124f42f6 100644
--- a/wscript
+++ b/wscript
@@ -394,6 +394,8 @@ int main() { return 0; }''',
             linker_flags.append('--stdlib=libstdc++')
             # Prevents visibility issues in standard headers
             conf.define("_DARWIN_C_SOURCE", 1)
+        else:
+            cxx_flags.append('-DBOOST_NO_AUTO_PTR')
 
     if (is_clang and platform == "darwin") or conf.env['build_host'] in ['mavericks', 'yosemite']:
         # Silence warnings about the non-existing osx clang compiler flags
@@ -799,7 +801,7 @@ def configure(conf):
     if Options.options.lv2dir:
         conf.env['LV2DIR'] = Options.options.lv2dir
     else:
-        conf.env['LV2DIR'] = os.path.join(conf.env['LIBDIR'], 'ardour' + str(conf.env['MAJOR']), 'lv2')
+        conf.env['LV2DIR'] = os.path.join(conf.env['LIBDIR'], 'ardour' + str(conf.env['MAJOR']), 'LV2')
 
     conf.env['LV2DIR'] = os.path.normpath(conf.env['LV2DIR'])
 
@@ -1068,6 +1070,7 @@ int main () { int x = SFC_AUTO_DOWNGRADE_RF64; return 0; }
         sub_config_and_use(conf, 'libs/appleutility')
     elif Options.options.dist_target != 'mingw':
         sub_config_and_use(conf, 'tools/sanity_check')
+        sub_config_and_use(conf, 'tools/gccabicheck')
 
     sub_config_and_use(conf, 'libs/clearlooks-newer')
 
@@ -1183,6 +1186,7 @@ def build(bld):
         bld.recurse('libs/appleutility')
     elif bld.env['build_target'] != 'mingw':
         bld.recurse('tools/sanity_check')
+        bld.recurse('tools/gccabicheck')
 
     bld.recurse('libs/clearlooks-newer')