From nobody Tue Apr 30 11:36:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15246464826931007.070836451255; Wed, 25 Apr 2018 01:54:42 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CC181C057F4E; Wed, 25 Apr 2018 08:54:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C8E561353; Wed, 25 Apr 2018 08:54:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 83E01180596E; Wed, 25 Apr 2018 08:54:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3P8sZgw026350 for ; Wed, 25 Apr 2018 04:54:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5EF50200BC7C; Wed, 25 Apr 2018 08:54:35 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27B952026E03; Wed, 25 Apr 2018 08:54:33 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 25 Apr 2018 09:54:33 +0100 Message-Id: <20180425085433.6348-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Olaf Hering Subject: [libvirt] [PATCH] po: don't install gmo files when --disable-nls is given X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 25 Apr 2018 08:54:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 With --disable-nls is given we turn off use of gettext in the source code, but mistakenly still installed the gmo files. Reported-by: Olaf Hering Signed-off-by: Daniel P. Berrang=C3=A9 --- m4/virt-nls.m4 | 1 + po/Makefile.am | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/m4/virt-nls.m4 b/m4/virt-nls.m4 index f9fb27ceb5..be3c53fe4d 100644 --- a/m4/virt-nls.m4 +++ b/m4/virt-nls.m4 @@ -61,6 +61,7 @@ AC_DEFUN([LIBVIRT_CHECK_NLS],[ msgfmt_is_gnu=3Dno fi AC_MSG_RESULT([$msgfmt_is_gnu]) + AM_CONDITIONAL([ENABLE_NLS], [test "x$enable_nls" =3D "xyes"]) AM_CONDITIONAL([HAVE_GNU_GETTEXT_TOOLS], [test "x$XGETTEXT" !=3D "xno" && test "x$MSGFMT" !=3D "xno" && \ test "x$MSGMERGE" !=3D "xno" && test "x$msgfmt_is_gnu" !=3D "xno"]) diff --git a/po/Makefile.am b/po/Makefile.am index 812c6324ac..da117edbd5 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -89,6 +89,8 @@ $(srcdir)/%.gmo: $(srcdir)/%.po =20 endif HAVE_GNU_GETTEXT_TOOLS =20 +if ENABLE_NLS + # Cannot use 'localedir' since this conflicts with autoconf. langinstdir =3D $(datadir)/locale =20 @@ -105,3 +107,5 @@ uninstall-hook: d=3D$(DESTDIR)$(langinstdir)/$$lang/LC_MESSAGES; \ rm -f $$d/$(DOMAIN).mo; \ done + +endif ENABLE_NLS --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list