RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Do not require iconv program with --charset=noconv 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18674 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-06-10 20:11:38 +00:00
parent 35717af1e2
commit c75969c414
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -7114,23 +7114,24 @@ else
_def_charset="#undef MSG_CHARSET"
fi
if test "$_charset" = `cat ${_mp_help}.charset` ; then
# hack to disable conversion in the Makefile
_charset=""
fi
if test "$_charset" ; then
echocheck "iconv program"
iconv -f `cat ${_mp_help}.charset` -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG"
if test "$?" -ne 0 ; then
echores "no"
if test "$_charset" != `cat ${_mp_help}.charset` ; then
echo "No working iconv program found, use "
echo "--charset=`cat ${_mp_help}.charset` to continue anyway."
echo "If you also have problems with iconv library functions use --charset=noconv."
echo "Messages in the GTK-2 interface will be broken then."
exit 1
fi
else
echores "yes"
fi
if test "$_charset" = `cat ${_mp_help}.charset` ; then
# hack to disable conversion in the Makefile
_charset=""
fi
#############################################################################