[MPlayer-dev-eng] [PATCH] last minute fix for --charset=noconv

[Reimar Döffinger]

Hi,
checking for iconv program is pointless when it is not needed.
Currently ./configure --charset=noconv will fail when no working iconv
program is available, which is definitly not how it should be.
Please test the attached patch and if it works apply before release.

Greetings,
Reimar Döffinger
-------------- next part --------------
Index: configure
===================================================================
--- configure	(revision 18671)
+++ configure	(working copy)
@@ -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 libiconv 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
 
 #############################################################################