Mercurial > mplayer.hg
changeset 26799:06fa17a9ee01
Replace hack to disable iconv conversion of messages with something more sane.
| author | diego |
|---|---|
| date | Sun, 18 May 2008 23:16:30 +0000 |
| parents | 148b4021c6f5 |
| children | 3ff3bd9bf0f9 |
| files | Makefile configure |
| diffstat | 2 files changed, 2 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun May 18 19:05:52 2008 +0000 +++ b/Makefile Sun May 18 23:16:30 2008 +0000 @@ -765,7 +765,7 @@ @echo '// See the help/ subdir for the editable files.' >> help_mp.h @echo '#ifndef MPLAYER_HELP_MP_H' >> help_mp.h @echo '#define MPLAYER_HELP_MP_H' >> help_mp.h -ifeq ($(CHARSET),) +ifeq ($(CHARSET),UTF-8) @echo '#include "$(HELP_FILE)"' >> help_mp.h else iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h
--- a/configure Sun May 18 19:05:52 2008 +0000 +++ b/configure Sun May 18 23:16:30 2008 +0000 @@ -7330,12 +7330,7 @@ _def_charset="#undef MSG_CHARSET" fi -if test "$_charset" = "UTF-8" ; then - # hack to disable conversion in the Makefile - _charset="" -fi - -if test "$_charset" ; then +if test "$_charset" != "UTF-8" ; then echocheck "iconv program" iconv -f UTF-8 -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG" if test "$?" -ne 0 ; then