summaryrefslogtreecommitdiffstats
path: root/src/auto
diff options
context:
space:
mode:
authorRestorerZ <restorer@mail2k.ru>2024-03-12 22:11:36 +0100
committerChristian Brabandt <cb@256bit.org>2024-03-12 22:14:39 +0100
commite498cafe74e9073a9f8134f04c22b61d7bc68894 (patch)
tree33fd95ffb3a3027e87e3913e2a6b47418b7febb5 /src/auto
parent9a660d2883f92b3a3761c964dc14363a8f70c8d8 (diff)
patch 9.1.0173: msgfmt ver. 0.22 forcibly converts text to UTF-8v9.1.0173
Problem: msgfmt ver. 0.22 forcibly converts text to UTF-8 Solution: use '--no-convert' if msgfmt supports it. Add a configure check for the msgfmt version (RestorerZ). closes: #14163 Co-authored-by: Christian Brabandt <cb@256bit.org> Signed-off-by: RestorerZ <restorer@mail2k.ru> Signed-off-by: Christian Brabandt <cb@256bit.org>
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 5c14648353..9712104cde 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -650,6 +650,7 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS
LINK_AS_NEEDED
DEPEND_CFLAGS_FILTER
+MSGFMTCMD
MSGFMT_DESKTOP
MAKEMO
MSGFMT
@@ -15964,6 +15965,18 @@ 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; }
+ 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"
+ 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"
+ fi
+
fi
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no \"po/Makefile\" - disabled" >&5