configure: move gettext detection to meson.build

This will allow meson to honour -Dauto_features=disabled later.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20201210190417.31673-4-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2020-12-10 19:04:12 +00:00 committed by Paolo Bonzini
parent f3890e71ac
commit 0e8e77d487
3 changed files with 5 additions and 18 deletions

19
configure vendored
View File

@ -448,7 +448,7 @@ libdaxctl=""
meson=""
ninja=""
skip_meson=no
gettext=""
gettext="auto"
fuse="auto"
fuse_lseek="auto"
@ -1016,9 +1016,9 @@ for opt do
;;
--enable-vnc) vnc="enabled"
;;
--disable-gettext) gettext="false"
--disable-gettext) gettext="disabled"
;;
--enable-gettext) gettext="true"
--enable-gettext) gettext="enabled"
;;
--oss-lib=*) oss_lib="$optarg"
;;
@ -2848,19 +2848,6 @@ if test "$xen_pci_passthrough" != "disabled"; then
fi
fi
##########################################
# gettext probe
if test "$gettext" != "false" ; then
if has xgettext; then
gettext=true
else
if test "$gettext" = "true" ; then
feature_not_found "gettext" "Install xgettext binary"
fi
gettext=false
fi
fi
##########################################
# X11 probe
if $pkg_config --exists "x11"; then

View File

@ -9,7 +9,7 @@ option('sphinx_build', type : 'string', value : '',
option('docs', type : 'feature', value : 'auto',
description: 'Documentations build support')
option('gettext', type : 'boolean', value : true,
option('gettext', type : 'feature', value : 'auto',
description: 'Localization of the GTK+ user interface')
option('install_blobs', type : 'boolean', value : true,
description: 'install provided firmware blobs')

View File

@ -1,6 +1,6 @@
i18n = import('i18n')
if get_option('gettext')
if find_program('xgettext', required: get_option('gettext')).found()
i18n.gettext(meson.project_name(),
args: '--msgid-bugs-address=qemu-devel@nongnu.org',
preset: 'glib')