Commit 4f3216d7 authored by Xavier Claessens's avatar Xavier Claessens

Merge branch 'nls' into 'master'

Meson: Add 'nls' option to disable translation

See merge request GNOME/glib!484
parents 389087eb 74120117
Pipeline #42874 failed with stages
in 8 minutes
......@@ -1795,8 +1795,6 @@ glib_conf.set('HAVE_DCGETTEXT', 1)
glib_conf.set('HAVE_GETTEXT', 1)
glib_conf.set_quoted('GLIB_LOCALE_DIR', join_paths(glib_datadir, 'locale'))
# xgettext is optional (on Windows for instance)
xgettext = find_program('xgettext', required : false)
# libmount is only used by gio, but we need to fetch the libs to generate the
# pkg-config file below
......@@ -1981,12 +1979,14 @@ subdir('gobject')
subdir('gthread')
subdir('gmodule')
subdir('gio')
if xgettext.found()
subdir('po')
endif
subdir('fuzzing')
subdir('tests')
# xgettext is optional (on Windows for instance)
if find_program('xgettext', required : get_option('nls')).found()
subdir('po')
endif
# Install glib-gettextize executable, if a UNIX-style shell is found
if have_sh
# These should not contain " quotes around the values
......
......@@ -83,3 +83,9 @@ option('installed_tests',
type : 'boolean',
value : false,
description : 'enable installed tests')
option('nls',
type : 'feature',
value : 'auto',
yield: true,
description : 'Enable native language support (translations)')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment