From patchwork Wed Dec 16 16:48:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 344507 Delivered-To: patch@linaro.org Received: by 2002:a17:906:4755:0:0:0:0 with SMTP id j21csp503865ejs; Wed, 16 Dec 2020 08:50:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJwCnGklNBJ1ft37rraTQceJeo9OCu0SfsQ8qqduSrTXY8XWNXVsBCaSQrhX9bg1nvKAXzu+ X-Received: by 2002:a25:ab74:: with SMTP id u107mr48107773ybi.44.1608137449207; Wed, 16 Dec 2020 08:50:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608137449; cv=none; d=google.com; s=arc-20160816; b=dvm1XbEdu4VIsetNI9GFoAaFkFjk9Hs9YpkMFfqemxzmvSf2vyHIYO41Xd6UA4HI1c 4HWP0Oo2XFVNLnJyJBThG5yJ4jo6wfuAcMN8e0O3kKQ6sp20HSQAIQKQ43FzAmAQE9Pe 41gFhAPxROlT9SR39ET3P7aKZt8MmNS2fkHhHkH2ZCSaTL9aoRsxxJuN9iTCnXgTwVAU eaO8IpmL3KxrWe8wfpkhH1Ktzg5CuF1gANqbwzmjyNoBbH1RWO06Q9YZN2qQF9LXpsXq E7ZoDJNhqi/0FKByUUSWJ7mfusdHiIS79h9PpmVFxAgXTaZExLQw3aCr7iFbYtXG39pd scxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=q+yVXnhCi8nxgBbuZe7LUforhT3RhLUfoY188yCYeYY=; b=KL8eqduDjFd0+GSWjZKrQTrA/CuA3NuxHDqjaON1nFx7+9HlHF9kHcAQ3EAoBX4/KL SKhOgiX/kMIOMjM1IBm6SH+Q9Z3plR5Rsv36RRAb2ATBPX26Su167EHmeZElcT43ZQrh dQ1czaikWMV0D3dle3OW1O6BTGl93/JuJrZwFhzAHb9TnOHU2C7DopG0rKdFPOupPGYF cyBmE4JJZhUbY1xpgsjMqTTHGDeHemyA7UK5NODc0sLNzB1ChDYVDzl/GmjZgtEZy+Fa VEq9BUJyFBbx49mbZr/Q2tN04IAb4mz9kbaTPW6JQb8BfvcS2nFiZaxomcGqO5f9m5qf iG+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AAGBPu8+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f30si2151478ybi.491.2020.12.16.08.50.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Dec 2020 08:50:49 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AAGBPu8+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpa0m-0001uh-Em for patch@linaro.org; Wed, 16 Dec 2020 11:50:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpZyg-0007v2-Vz for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:48:39 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:33581) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpZye-0002OP-Rk for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:48:38 -0500 Received: by mail-wm1-x336.google.com with SMTP id n16so2306616wmc.0 for ; Wed, 16 Dec 2020 08:48:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q+yVXnhCi8nxgBbuZe7LUforhT3RhLUfoY188yCYeYY=; b=AAGBPu8+fj3ei0DyCd0pxkqVXTvxDFghQtDTc5jdlVcW2iPIgWX4HgUKg2eyA5EXvd trKcGjdJ/RkwPWLTD7DjnYl0BNHZg7k7pq9xyvL7ZK9VKBkFOVAed4kcoxx7uK9xR06L eiOFQRfp9533JuhWBfqbRUwIABKVFCRyc6k9UO1lo+PXtuh2pCC6KTNlpLb1Lma7WTS6 Ea5Z+aP/jZF7OB1esf3Na9bL9g7unhoH9+zD3+WYMmtpuYA0oJGYhP6Ihy34vd+kbxSk gMtLFlRI2u5XBtYIM8LDhExlb0xM9fxkOC2hIJDk3L91EP4PsohVK5NJJ+9u4DHxWK5A ItRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q+yVXnhCi8nxgBbuZe7LUforhT3RhLUfoY188yCYeYY=; b=U6kpSmy4zS3nyGk2xOQXyo518toc9lGJozpUu8JrCOTUqoOPoQJVBMvjExd4qpLqSJ haJYtuUJqISRI93qCorOeRNyCoz+jTMU60g8u72t8U6GowEb1EVqL+Oq/Faecd3LeUFr yckhexxIEmeClirCFDujG4SjNjyWAcdhEXa65/UNvsSUqOJIXkt+sKmS2s7pDP+E/Y6p iRrQ9cAqMTGbPdFt0ncKkaEm2ILFnvLoC8tqBIC1yy8lRxeN7fWEaRovxMA0rZEEBTfS 3E/pbXRNm7frNtwJBK8nV04/KF0FrgrYThB7vnTt8BJSxXg6YyaFO6E1VTBAiwqs/cCk VXag== X-Gm-Message-State: AOAM530SBk2egrUVU/PryC/1f3TWECcv8MKYJ+8dyhBwD50uVEYzKXRO kIlpJtm1YGiH0Q4bljCxMo/T9Q== X-Received: by 2002:a1c:1dd4:: with SMTP id d203mr4295012wmd.118.1608137314804; Wed, 16 Dec 2020 08:48:34 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w4sm3498238wmc.13.2020.12.16.08.48.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 08:48:30 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2BA3A1FF8F; Wed, 16 Dec 2020 16:48:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 03/11] configure: move gettext detection to meson.build Date: Wed, 16 Dec 2020 16:48:19 +0000 Message-Id: <20201216164827.24457-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201216164827.24457-1-alex.bennee@linaro.org> References: <20201216164827.24457-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This will allow meson to honour -Dauto_features=disabled later. Suggested-by: Paolo Bonzini Signed-off-by: Alex Bennée Acked-by: Paolo Bonzini Message-Id: <20201210190417.31673-4-alex.bennee@linaro.org> -- 2.20.1 diff --git a/configure b/configure index d37ec98aa9..f9b1e4fbb0 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" ;; @@ -2847,19 +2847,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 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')