External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

po: don't install gmo files when --disable-nls is given

Browse Source 
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>
This commit is contained in:
Daniel P. Berrangé 2018-04-25 09:53:09 +01:00
parent fc06debd0c
commit 3f4db69c2f
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
m4/virt-nls.m4
View File

@ -61,6 +61,7 @@ AC_DEFUN([LIBVIRT_CHECK_NLS],[
msgfmt_is_gnu=no msgfmt_is_gnu=no
fi fi
AC_MSG_RESULT([$msgfmt_is_gnu]) AC_MSG_RESULT([$msgfmt_is_gnu])
AM_CONDITIONAL([ENABLE_NLS], [test "x$enable_nls" = "xyes"])
AM_CONDITIONAL([HAVE_GNU_GETTEXT_TOOLS], AM_CONDITIONAL([HAVE_GNU_GETTEXT_TOOLS],
[test "x$XGETTEXT" != "xno" && test "x$MSGFMT" != "xno" && \ [test "x$XGETTEXT" != "xno" && test "x$MSGFMT" != "xno" && \
test "x$MSGMERGE" != "xno" && test "x$msgfmt_is_gnu" != "xno"]) test "x$MSGMERGE" != "xno" && test "x$msgfmt_is_gnu" != "xno"])

4
po/Makefile.am
View File

@ -89,6 +89,8 @@ $(srcdir)/%.gmo: $(srcdir)/%.po
endif HAVE_GNU_GETTEXT_TOOLS endif HAVE_GNU_GETTEXT_TOOLS
if ENABLE_NLS
# Cannot use 'localedir' since this conflicts with autoconf. # Cannot use 'localedir' since this conflicts with autoconf.
langinstdir = $(datadir)/locale langinstdir = $(datadir)/locale
@ -105,3 +107,5 @@ uninstall-hook:
d=$(DESTDIR)$(langinstdir)/$$lang/LC_MESSAGES; \ d=$(DESTDIR)$(langinstdir)/$$lang/LC_MESSAGES; \
rm -f $$d/$(DOMAIN).mo; \ rm -f $$d/$(DOMAIN).mo; \
done done
endif ENABLE_NLS