summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-05-13 19:03:20 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-05-13 19:03:20 +0000
commit196193ad9e48595ea45e2272adcfe07b222cea39 (patch)
treec5f0f14234c79be3c00453e1333cb9260302a802 /configure
parent905c2b870bc6f69e82738243d1804cc30ef84520 (diff)
downloadmpv-196193ad9e48595ea45e2272adcfe07b222cea39.tar.bz2
mpv-196193ad9e48595ea45e2272adcfe07b222cea39.tar.xz
add check for a working iconv program and point to workaround if not found
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18488 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure18
1 files changed, 18 insertions, 0 deletions
diff --git a/configure b/configure
index 20f057495b..6e971eb89c 100755
--- a/configure
+++ b/configure
@@ -7057,6 +7057,24 @@ else
_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
#############################################################################