Mercurial > mplayer.hg
changeset 18673:02e837b23337
Do not require iconv program with --charset=noconv
| author | reimar |
|---|---|
| date | Sat, 10 Jun 2006 20:11:38 +0000 |
| parents | f3b0eea2ae9a |
| children | abaac3427f7c |
| files | configure |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Jun 10 12:24:43 2006 +0000 +++ b/configure Sat Jun 10 20:11:38 2006 +0000 @@ -7114,23 +7114,24 @@ _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 #############################################################################