Mercurial > vim
changeset 16974:15f787b7da56 v8.1.1487
patch 8.1.1487: older msgfmt cannot generate proper .desktop file
commit https://github.com/vim/vim/commit/62a88f498ac8d996bc976871cd80fcc14466f013
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jun 7 20:44:40 2019 +0200
patch 8.1.1487: older msgfmt cannot generate proper .desktop file
Problem: Older msgfmt cannot generate proper .desktop file.
Solution: Add a configure check to not use this msgfmt version. (Ken Takata)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 07 Jun 2019 20:45:06 +0200 |
| parents | a2c3e18b035c |
| children | 484cc6f86870 |
| files | src/auto/configure src/configure.ac src/version.c |
| diffstat | 3 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -14549,9 +14549,14 @@ rm -f core conftest.err conftest.$ac_obj $as_echo_n "checking if msgfmt supports --desktop... " >&6; } MSGFMT_DESKTOP= if "$MSGFMT" --help | grep -e '--desktop' >/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + if "$MSGFMT" --version | grep '0.19.[3-7]$' >/dev/null; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: broken" >&5 +$as_echo "broken" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - MSGFMT_DESKTOP="gvim.desktop vim.desktop" + MSGFMT_DESKTOP="gvim.desktop vim.desktop" + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; }
--- a/src/configure.ac +++ b/src/configure.ac @@ -4302,8 +4302,14 @@ if test "$enable_nls" = "yes"; then AC_MSG_CHECKING([if msgfmt supports --desktop]) MSGFMT_DESKTOP= if "$MSGFMT" --help | grep -e '--desktop' >/dev/null; then - AC_MSG_RESULT([yes]) - MSGFMT_DESKTOP="gvim.desktop vim.desktop" + if "$MSGFMT" --version | grep '0.19.[[3-7]]$' >/dev/null; then + dnl GNU gettext 0.19.7's --desktop is broken. We assume back to + dnl 0.19.3 is also broken. + AC_MSG_RESULT([broken]) + else + AC_MSG_RESULT([yes]) + MSGFMT_DESKTOP="gvim.desktop vim.desktop" + fi else AC_MSG_RESULT([no]) fi