Mercurial > mplayer.hg

changeset 18487:d8083c152f3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add check for a working iconv program and point to workaround if not found
author reimar
date Sat, 13 May 2006 19:03:20 +0000
parents 928087596d71
children b23c0e341e3e
files configure
diffstat 1 files changed, 18 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sat May 13 18:38:57 2006 +0000
+++ b/configure	Sat May 13 19:03:20 2006 +0000
@@ -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
 
 #############################################################################