fix OS X system detection (amend 66704ee)

diff --git a/libs/appleutility/wscript b/libs/appleutility/wscript
index cf596b29a6aa46e91b461a6058acaa1ebf4e7ee7..63a1a1a4659b280bb66eebebdc1eb642527a84c5 100644 (file)
--- a/libs/appleutility/wscript
+++ b/libs/appleutility/wscript
@@ -26,11 +26,10 @@ def options(opt):
 
 def configure(conf):
     autowaf.configure(conf)
-    if not conf.env['build_target'] in ['panther', 'tiger', 'leopard']:
-        if not (Options.options.ppc and conf.env['build_target'] == 'snowleopard'):
-            conf.env.append_value ('CFLAGS', '-DCOREAUDIO105')
-            conf.env.append_value ('CXXFLAGS', '-DCOREAUDIO105')
-            conf.define ('COREAUDIO105', 1)
+    if conf.env['build_target'] in ['panther', 'tiger', 'leopard'] or (Options.options.ppc and conf.env['build_target'] == 'snowleopard'):
+        conf.env.append_value ('CFLAGS', '-DCOREAUDIO105')
+        conf.env.append_value ('CXXFLAGS', '-DCOREAUDIO105')
+        conf.define ('COREAUDIO105', 1)
 
 def build(bld):
     obj                = bld(features = 'cxx cxxshlib')

diff --git a/wscript b/wscript
index 14d660276d06a8d01d45bd7950c16cd051b574c9..4319de317b05f3c9b477a47db52dd93e5ab20603 100644 (file)
--- a/wscript
+++ b/wscript
@@ -1103,6 +1103,7 @@ const char* const ardour_config_info = "\\n\\
     write_config_text('Free/Demo copy',        conf.is_defined('FREEBIE'))
     write_config_text('Build target',          conf.env['build_target'])
     write_config_text('CoreAudio',             conf.is_defined('HAVE_COREAUDIO'))
+    write_config_text('CoreAudio 10.5 compat', conf.is_defined('COREAUDIO105'))
     write_config_text('CoreAudio/Midi Backend',conf.env['BUILD_CORECRAPPITA'])
     write_config_text('Debug RT allocations',  conf.is_defined('DEBUG_RT_ALLOC'))
     write_config_text('Debug Symbols',         conf.is_defined('debug_symbols') or conf.env['DEBUG'])