thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.0308: configure: msgfmt hardcoded

Browse Source 
Problem:  configure: msgfmt hardcoded (after v9.1.0173)
Solution: use $MSGFMT instead of msgfmt in configure script,
          regenerate the configure script
          (Vladimír Marek)

fixes: #14515

Signed-off-by: Vladimír Marek <vlmarek13@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Vladimír Marek
2024-04-11 21:54:34 +02:00
committed by Christian Brabandt
parent fcbefe74f1
commit 87319173ba
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/auto/configure vendored
View File

@@ -15965,16 +15965,16 @@ printf "%s\n" "yes" >&6; }
printf "%s\n" "no" >&6; }
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if msgfmt supports --no-convert" >&5
printf %s "checking if msgfmt supports --no-convert... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MSGFMT supports --no-convert" >&5
printf %s "checking if $MSGFMT supports --no-convert... " >&6; }
if "$MSGFMT" --help | grep -q -- '--no-convert' >/dev/null; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
MSGFMTCMD="OLD_PO_FILE_INPUT=yes msgfmt --no-convert -v"
MSGFMTCMD="OLD_PO_FILE_INPUT=yes $MSGFMT --no-convert -v"
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
MSGFMTCMD="OLD_PO_FILE_INPUT=yes msgfmt -v"
MSGFMTCMD="OLD_PO_FILE_INPUT=yes $MSGFMT -v"
fi
fi

6
src/configure.ac
View File

@@ -4523,13 +4523,13 @@ if test "$enable_nls" = "yes"; then
AC_MSG_RESULT([no])
fi
AC_SUBST(MSGFMT_DESKTOP)
AC_MSG_CHECKING([if msgfmt supports --no-convert])
AC_MSG_CHECKING([if $MSGFMT supports --no-convert])
if "$MSGFMT" --help | grep -q -- '--no-convert' >/dev/null; then
AC_MSG_RESULT([yes])
MSGFMTCMD="OLD_PO_FILE_INPUT=yes msgfmt --no-convert -v"
MSGFMTCMD="OLD_PO_FILE_INPUT=yes $MSGFMT --no-convert -v"
else
AC_MSG_RESULT([no])
MSGFMTCMD="OLD_PO_FILE_INPUT=yes msgfmt -v"
MSGFMTCMD="OLD_PO_FILE_INPUT=yes $MSGFMT -v"
fi
AC_SUBST(MSGFMTCMD)
fi

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
308,
/**/
307,
/**/