From 834e6445159630cfe624c17198d4dde2288b1b7c Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Sun, 28 Mar 2021 18:56:19 +0200 Subject: [PATCH] [meson] More fixes related to CONFIG_NLS --- meson.build | 2 +- po/meson.build | 2 +- src/intl/gettext/libgettext.h | 2 +- src/intl/meson.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 9efab553..1fc8ecaf 100644 --- a/meson.build +++ b/meson.build @@ -92,7 +92,7 @@ conf_data.set('CONFIG_LIBDOM', get_option('libdom')) #CONFIG_XBEL_BOOKMARKS=true #CONFIG_COOKIES=true #CONFIG_DOM=true -if conf_data.get('CONFIG_SCRIPTING_SPIDERMONKEY') == 1 or conf_data.get('CONFIG_ECMASCRIPT_SMJS') +if conf_data.get('CONFIG_SCRIPTING_SPIDERMONKEY') or conf_data.get('CONFIG_ECMASCRIPT_SMJS') conf_data.set('CONFIG_ECMASCRIPT', true) else conf_data.set('CONFIG_ECMASCRIPT', false) diff --git a/po/meson.build b/po/meson.build index e278475e..a5160bc7 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1,4 +1,4 @@ -if conf_data.get('CONFIG_NLS') == 1 +if conf_data.get('CONFIG_NLS') i18n = import('i18n') # define GETTEXT_PACKAGE add_project_arguments('-DGETTEXT_PACKAGE="elinks"', language:'c') diff --git a/src/intl/gettext/libgettext.h b/src/intl/gettext/libgettext.h index 89b8c9e0..28b2a542 100644 --- a/src/intl/gettext/libgettext.h +++ b/src/intl/gettext/libgettext.h @@ -23,7 +23,7 @@ extern "C" { #endif /* NLS can be disabled through the configure --disable-nls option. */ -#if CONFIG_NLS +#ifdef CONFIG_NLS /* Get declarations of GNU message catalog functions. */ #include "intl/gettext/libgnuintl.h" diff --git a/src/intl/meson.build b/src/intl/meson.build index d1dd250b..ead928d3 100644 --- a/src/intl/meson.build +++ b/src/intl/meson.build @@ -1,4 +1,4 @@ -if conf_data.get('CONFIG_NLS') == 1 +if conf_data.get('CONFIG_NLS') subdir('gettext') endif srcs += files('charsets.c')