Mercurial > vim

changeset 34888:a843afce8fcf v9.1.0308

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.1.0308: configure: msgfmt hardcoded Commit: https://github.com/vim/vim/commit/87319173baf7b60b2e21e7d254a46623c53c5899 Author: Vladim?r Marek <vlmarek13@gmail.com> Date: Thu Apr 11 21:54:34 2024 +0200 patch 9.1.0308: configure: msgfmt hardcoded 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>
author Christian Brabandt <cb@256bit.org>
date Thu, 11 Apr 2024 22:00:03 +0200
parents 4e9d1cafdcf6
children 4911fc2cbd37
files src/auto/configure src/configure.ac src/version.c
diffstat 3 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -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
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -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
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    308,
+/**/
     307,
 /**/
     306,