diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2018-04-25 09:53:09 +0100 |
|---|---|---|
| committer | Daniel P. Berrangé <berrange@redhat.com> | 2018-06-05 17:36:42 +0100 |
| commit | 3f4db69c2fdeb3d417af6b57c614ce70d41cc94c (patch) | |
| tree | df6ec4e565aae7db1bb81192a35b05985072da27 | |
| parent | fc06debd0c6348c8d27fb8eb5989ebf0528d7103 (diff) | |
| download | libvirt-3f4db69c2fdeb3d417af6b57c614ce70d41cc94c.tar.gz | |
po: don't install gmo files when --disable-nls is given
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 <olaf@aepfle.de>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
| -rw-r--r-- | m4/virt-nls.m4 | 1 | ||||
| -rw-r--r-- | po/Makefile.am | 4 |
2 files changed, 5 insertions, 0 deletions
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=no fi AC_MSG_RESULT([$msgfmt_is_gnu]) + AM_CONDITIONAL([ENABLE_NLS], [test "x$enable_nls" = "xyes"]) AM_CONDITIONAL([HAVE_GNU_GETTEXT_TOOLS], [test "x$XGETTEXT" != "xno" && test "x$MSGFMT" != "xno" && \ test "x$MSGMERGE" != "xno" && test "x$msgfmt_is_gnu" != "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 endif HAVE_GNU_GETTEXT_TOOLS +if ENABLE_NLS + # Cannot use 'localedir' since this conflicts with autoconf. langinstdir = $(datadir)/locale @@ -105,3 +107,5 @@ uninstall-hook: d=$(DESTDIR)$(langinstdir)/$$lang/LC_MESSAGES; \ rm -f $$d/$(DOMAIN).mo; \ done + +endif ENABLE_NLS |