[MPlayer-cvslog] r18674 - trunk/configure

[reimar]

Author: reimar
Date: Sat Jun 10 22:11:38 2006
New Revision: 18674

Modified:
   trunk/configure

Log:
Do not require iconv program with --charset=noconv


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sat Jun 10 22:11:38 2006
@@ -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
 
 #############################################################################