Fix --no-nls (1/5): ENABLE_NLS = 1/0 config
authorRobin Gareus <robin@gareus.org>
Fri, 21 Sep 2018 17:00:33 +0000 (19:00 +0200)
committerRobin Gareus <robin@gareus.org>
Fri, 21 Sep 2018 17:00:33 +0000 (19:00 +0200)
system-wide gettext uses `#if ENABLE_NLS`, not #ifdef

wscript

diff --git a/wscript b/wscript
index c3465c076b0c1324b46650a6ee3c57362f7aceac..6bdef92f639810011e5c1ed07a7bc5bb76f88555 100644 (file)
--- a/wscript
+++ b/wscript
@@ -669,9 +669,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')
@@ -1173,6 +1170,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