[MPlayer-cvslog] CVS: main configure,1.1202,1.1203

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv13530

Modified Files:
	configure 
Log Message:
add check for a working iconv program and point to workaround if not found


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1202
retrieving revision 1.1203
diff -u -r1.1202 -r1.1203
--- configure	13 May 2006 14:50:45 -0000	1.1202
+++ configure	13 May 2006 19:03:20 -0000	1.1203
@@ -7057,6 +7057,24 @@
   _def_charset="#undef MSG_CHARSET"
 fi
 
+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 "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
 
 #############################################################################