[MPlayer-cvslog] r26831 - in trunk: Makefile configure

[diego]

Author: diego
Date: Mon May 19 01:16:30 2008
New Revision: 26831

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


Modified:
   trunk/Makefile
   trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon May 19 01:16:30 2008
@@ -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

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Mon May 19 01:16:30 2008
@@ -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