X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=d6d75d56cafdf4b79b680a19c46795ee57b9bf24;hb=80aa43b830f9d53401b4ea7dc7a7a80978981eb4;hp=4cec7802689f4320a74f41fff87cf21c00bedb08;hpb=12544795e864e0210a97bbaaaaebfa3892e0b005;p=ardour.git

diff --git a/wscript b/wscript
index 4cec780268..d6d75d56ca 100644
--- a/wscript
+++ b/wscript
@@ -165,8 +165,8 @@ def fetch_tarball_revision_date():
     with open('libs/ardour/revision.cc', 'rb') as f:
         content = f.readlines()
         remove_punctuation_map = dict((ord(char), None) for char in '";')
-        raw_line_tokens = content[1].decode('utf-8').strip().split(' ')
 
+        raw_line_tokens = content[1].decode('utf-8').strip().split(' ')
         rev = raw_line_tokens[7].translate(remove_punctuation_map)
         date = raw_line_tokens[12].translate(remove_punctuation_map)
 
@@ -236,6 +236,7 @@ children = [
         'libs/qm-dsp',
         'libs/vamp-plugins',
         'libs/zita-resampler',
+        'libs/zita-convolver',
         # core ardour libraries
         'libs/pbd',
         'libs/midi++2',
@@ -308,9 +309,8 @@ def create_stored_revision():
         #
         text =  '#include "ardour/revision.h"\n'
         text += (
-            'namespace ARDOUR { '
-                'const char* revision = \"%s\"; '
-                'const char* date = \"%s\"; }\n'
+            'namespace ARDOUR { const char* revision = \"%s\"; '
+            'const char* date = \"%s\"; }\n'
         ) % (rev, rev_date)
         print('Writing revision info to libs/ardour/revision.cc using ' + rev + ', ' + rev_date)
         o = open('libs/ardour/revision.cc', 'w')
@@ -670,9 +670,6 @@ int main() { return 0; }''',
         ('-D__STDC_LIMIT_MACROS', '-D__STDC_FORMAT_MACROS',
          '-DCANVAS_COMPATIBILITY', '-DCANVAS_DEBUG'))
 
-    if opt.nls:
-        compiler_flags.append('-DENABLE_NLS')
-
     # use sparingly, prefer runtime profile
     if Options.options.program_name.lower() == "mixbus":
         compiler_flags.append ('-DMIXBUS')
@@ -1174,6 +1171,9 @@ int main () { return 0; }
     if opts.nls:
         conf.define('ENABLE_NLS', 1)
         conf.env['ENABLE_NLS'] = True
+    else:
+        conf.define('ENABLE_NLS', 0)
+        conf.env['ENABLE_NLS'] = False
     if opts.build_tests:
         conf.env['BUILD_TESTS'] = True
         conf.env['RUN_TESTS'] = opts.run_tests