diff options
| author | Vladimír Marek <vlmarek13@gmail.com> | 2024-04-11 21:54:34 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-04-11 21:57:02 +0200 |
| commit | 87319173baf7b60b2e21e7d254a46623c53c5899 (patch) | |
| tree | 57ef4b30c8fcb09ff8b400c42852a21d023014de | |
| parent | fcbefe74f1619dfd925033d83a6d233c686409d4 (diff) | |
patch 9.1.0308: configure: msgfmt hardcodedv9.1.0308
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>
| -rwxr-xr-x | src/auto/configure | 8 | ||||
| -rw-r--r-- | src/configure.ac | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/auto/configure b/src/auto/configure index 9712104cde..0e0cf8efed 100755 --- 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 diff --git a/src/configure.ac b/src/configure.ac index 6311269e15..f6e54b30b0 100644 --- 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 diff --git a/src/version.c b/src/version.c index 8712523285..87e98d5f6f 100644 --- 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, |