From df2a18ec1c7be3777db18f07769aa1677147c321 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 21 Sep 2018 19:00:33 +0200 Subject: [PATCH] Fix --no-nls (1/5): ENABLE_NLS = 1/0 config system-wide gettext uses `#if ENABLE_NLS`, not #ifdef --- wscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wscript b/wscript index c3465c076b..6bdef92f63 100644 --- 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