File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -14549,9 +14549,14 @@ rm -f core conftest.err conftest.$ac_objext \
1454914549$as_echo_n " checking if msgfmt supports --desktop... " >&6 ; }
1455014550 MSGFMT_DESKTOP=
1455114551 if " $MSGFMT " --help | grep -e ' --desktop' > /dev/null; then
14552- { $as_echo " $as_me :${as_lineno-$LINENO } : result: yes" >&5
14552+ if " $MSGFMT " --version | grep ' 0.19.[3-7]$' > /dev/null; then
14553+ { $as_echo " $as_me :${as_lineno-$LINENO } : result: broken" >&5
14554+ $as_echo " broken" >&6 ; }
14555+ else
14556+ { $as_echo " $as_me :${as_lineno-$LINENO } : result: yes" >&5
1455314557$as_echo " yes" >&6 ; }
14554- MSGFMT_DESKTOP=" gvim.desktop vim.desktop"
14558+ MSGFMT_DESKTOP=" gvim.desktop vim.desktop"
14559+ fi
1455514560 else
1455614561 { $as_echo " $as_me :${as_lineno-$LINENO } : result: no" >&5
1455714562$as_echo " no" >&6 ; }
Original file line number Diff line number Diff line change @@ -4302,8 +4302,14 @@ if test "$enable_nls" = "yes"; then
43024302 AC_MSG_CHECKING ( [ if msgfmt supports --desktop] )
43034303 MSGFMT_DESKTOP=
43044304 if "$MSGFMT" --help | grep -e '--desktop' >/dev/null; then
4305- AC_MSG_RESULT ( [ yes] )
4306- MSGFMT_DESKTOP="gvim.desktop vim.desktop"
4305+ if "$MSGFMT" --version | grep '0.19.[ [ 3-7] ] $' >/dev/null; then
4306+ dnl GNU gettext 0.19.7's --desktop is broken. We assume back to
4307+ dnl 0.19.3 is also broken.
4308+ AC_MSG_RESULT ( [ broken] )
4309+ else
4310+ AC_MSG_RESULT ( [ yes] )
4311+ MSGFMT_DESKTOP="gvim.desktop vim.desktop"
4312+ fi
43074313 else
43084314 AC_MSG_RESULT ( [ no] )
43094315 fi
Original file line number Diff line number Diff line change @@ -767,6 +767,8 @@ static char *(features[]) =
767767
768768static int included_patches [] =
769769{ /* Add new patch number below this line */
770+ /**/
771+ 1487 ,
770772/**/
771773 1486 ,
772774/**/
You can’t perform that action at this time.
0 commit comments