summaryrefslogtreecommitdiffstats
path: root/src/auto
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-11 15:25:40 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-11 15:25:40 +0200
commit26096cc96fc402db45948b3b662a380281585649 (patch)
tree83c6e9aab5786a7c17674d68b121d227fdafaee3 /src/auto
parent730f48fe3691dc62331f3df23cb947bfc33a5add (diff)
patch 8.1.1149: building desktop files fails with older msgfmtv8.1.1149
Problem: Building desktop files fails with older msgfmt. Solution: Add autoconf check. Avoid always building the desktop files.
Diffstat (limited to 'src/auto')
-rwxr-xr-xsrc/auto/configure13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/auto/configure b/src/auto/configure
index db3e3b1e45..c273857919 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -623,6 +623,7 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS
LINK_AS_NEEDED
DEPEND_CFLAGS_FILTER
+MSGFMT_DESKTOP
MAKEMO
MSGFMT
INSTALL_TOOL_LANGS
@@ -14533,6 +14534,18 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt supports --desktop" >&5
+$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
+$as_echo "yes" >&6; }
+ MSGFMT_DESKTOP="gvim.desktop vim.desktop"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no \"po/Makefile\" - disabled" >&5