Replace hack to disable iconv conversion of messages with something more sane.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26831 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 2 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index bc13902034..46d59343f1 100644
--- a/Makefile
+++ b/Makefile
@@ -765,7 +765,7 @@ help_mp.h: help/help_mp-en.h $(HELP_FILE)
 	@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
diff --git a/configure b/configure
index 9961d40703..e8daf4c03d 100755
--- a/configure
+++ b/configure
@@ -7330,12 +7330,7 @@ else
   _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