Remove unused ustring version of url_decode(). Rework

[ardour.git] / wscript

diff --git a/wscript b/wscript
index ed06bcf4b71ec62fea879c3ff86521959d2f280a..08a3827f474f92a0a9736f48ade51807132a97c8 100644 (file)
--- a/wscript
+++ b/wscript
@@ -450,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)
@@ -502,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: