summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAlex Bennée2020-12-10 20:04:12 +0100
committerPaolo Bonzini2021-01-02 21:03:09 +0100
commit0e8e77d487b3d8ae33158e61c30e1fe5c753a114 (patch)
treec96bd571673e31f02e00165afe261c6c7434cc5b /configure
parentgitlab: include aarch64-softmmu and ppc64-softmmu cross-system-build (diff)
downloadqemu-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>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure19
1 files changed, 3 insertions, 16 deletions
diff --git a/configure b/configure
index 881af4b6be..487d272921 100755
--- a/configure
+++ b/configure
@@ -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