MCP: remove debugging related to selection that turned out to be about some JACK...

[ardour.git] / wscript

diff --git a/wscript b/wscript
index d2b185c4c9b7b7fde78317c5a591b1291feaf2f1..6f58ceb67a0489a370f73b25a8c5153906849845 100644 (file)
--- a/wscript
+++ b/wscript
@@ -436,7 +436,6 @@ def configure(conf):
                'Thanks for your co-operation with our development process.\n\n' +
                'Press Enter to continue.\n')
         sys.stdin.readline()
-    create_stored_revision()
     conf.env['VERSION'] = VERSION
     conf.line_just = 52
     autowaf.set_recursive()
@@ -451,8 +450,17 @@ def configure(conf):
 
     if sys.platform == 'darwin':
 
+        # libintl may or may not be trivially locatable
+        if not os.path.isfile ('/usr/include/libintl.h'):
+            # XXXX hack hack hack
+            prefinclude = ''.join ([ '-I', os.path.expanduser ('~/gtk/inst/include') ])
+            preflib = ''.join ([ '-L', os.path.expanduser ('~/gtk/inst/lib') ])
+            conf.env.append_value('CFLAGS', [ prefinclude ])
+            conf.env.append_value('CXXFLAGS',  [prefinclude ])
+            conf.env.append_value('LINKFLAGS', [ preflib ])
+
         # this is required, potentially, for anything we link and then relocate into a bundle
-        conf.env.append_value('LINKFLAGS', [ '-Xlinker', '-headerpad', '-Xlinker', '2048'])
+        conf.env.append_value('LINKFLAGS', [ '-Xlinker', '-headerpad_max_install_names' ])
 
         conf.define ('HAVE_COREAUDIO', 1)
         conf.define ('AUDIOUNIT_SUPPORT', 1)
@@ -503,7 +511,7 @@ def configure(conf):
         conf.env.append_value('LINKFLAGS_OSX', ['-flat_namespace'])
 
         conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAUDIOUNIT_SUPPORT")
-        conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Audiotoolbox', '-framework', 'AudioUnit'])
+        conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'AudioToolbox', '-framework', 'AudioUnit'])
         conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Cocoa'])
 
         if not Options.options.freebie:
@@ -635,7 +643,6 @@ const char* const ardour_config_info = "\\n\\
     write_config_text('JACK session support',  conf.is_defined('JACK_SESSION'))
     write_config_text('LV2 UI embedding',      conf.is_defined('HAVE_SUIL'))
     write_config_text('LV2 support',           conf.is_defined('LV2_SUPPORT'))
-    write_config_text('LV2 state support',     conf.is_defined('HAVE_NEW_LILV'))
     write_config_text('LXVST support',         conf.is_defined('LXVST_SUPPORT'))
     write_config_text('OGG',                   conf.is_defined('HAVE_OGG'))
     write_config_text('Phone home',            conf.is_defined('PHONE_HOME'))
@@ -659,6 +666,8 @@ const char* const ardour_config_info = "\\n\\
     print('')
 
 def build(bld):
+    create_stored_revision()
+
     # add directories that contain only headers, to workaround an issue with waf
 
     bld.path.find_dir ('libs/evoral/evoral')