diff options
| author | Alex Bennée | 2020-12-10 20:04:12 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2021-01-02 21:03:09 +0100 |
| commit | 0e8e77d487b3d8ae33158e61c30e1fe5c753a114 (patch) | |
| tree | c96bd571673e31f02e00165afe261c6c7434cc5b | |
| parent | gitlab: include aarch64-softmmu and ppc64-softmmu cross-system-build (diff) | |
| download | qemu-0e8e77d487b3d8ae33158e61c30e1fe5c753a114.tar.gz qemu-0e8e77d487b3d8ae33158e61c30e1fe5c753a114.tar.xz qemu-0e8e77d487b3d8ae33158e61c30e1fe5c753a114.zip | |
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>
| -rwxr-xr-x | configure | 19 | ||||
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rw-r--r-- | po/meson.build | 2 |
3 files changed, 5 insertions, 18 deletions
@@ -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" ;; @@ -2849,19 +2849,6 @@ if test "$xen_pci_passthrough" != "disabled"; then 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 have_x11=yes diff --git a/meson_options.txt b/meson_options.txt index 74ac853548..f8f053b5c8 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -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') diff --git a/po/meson.build b/po/meson.build index 1387fd979a..a863f0575f 100644 --- a/po/meson.build +++ b/po/meson.build @@ -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') |