comparison configure @ 20634:32b693286d0b

remove charset files (all of them are in UTF-8 now anyway) change build system accordingly
author kraymer
date Fri, 03 Nov 2006 21:52:35 +0000
parents 1a4fcea7ab53
children 9ed557ae1383
comparison
equal deleted inserted replaced
20633:44ea011155d1 20634:32b693286d0b
7149 7149
7150 if test "$_charset" = "noconv" ; then 7150 if test "$_charset" = "noconv" ; then
7151 _charset="" 7151 _charset=""
7152 elif test -z "$_charset" ; then 7152 elif test -z "$_charset" ; then
7153 if test "$_gtk1" = yes ; then 7153 if test "$_gtk1" = yes ; then
7154 _charset=`cat ${_mp_help}.charset`
7155 else
7156 _charset="UTF-8" 7154 _charset="UTF-8"
7157 fi 7155 fi
7158 fi 7156 fi
7159 if test "$_charset" ; then 7157 if test "$_charset" ; then
7160 _def_charset="#define MSG_CHARSET \"$_charset\"" 7158 _def_charset="#define MSG_CHARSET \"$_charset\""
7161 else 7159 else
7162 _def_charset="#undef MSG_CHARSET" 7160 _def_charset="#undef MSG_CHARSET"
7163 fi 7161 fi
7164 7162
7165 if test "$_charset" = `cat ${_mp_help}.charset` ; then 7163 if test "$_charset" = "UTF-8" ; then
7166 # hack to disable conversion in the Makefile 7164 # hack to disable conversion in the Makefile
7167 _charset="" 7165 _charset=""
7168 fi 7166 fi
7169 7167
7170 if test "$_charset" ; then 7168 if test "$_charset" ; then
7171 echocheck "iconv program" 7169 echocheck "iconv program"
7172 iconv -f `cat ${_mp_help}.charset` -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG" 7170 iconv -f UTF-8 -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG"
7173 if test "$?" -ne 0 ; then 7171 if test "$?" -ne 0 ; then
7174 echores "no" 7172 echores "no"
7175 echo "No working iconv program found, use " 7173 echo "No working iconv program found, use "
7176 echo "--charset=`cat ${_mp_help}.charset` to continue anyway." 7174 echo "--charset=UTF-8 to continue anyway."
7177 echo "If you also have problems with iconv library functions use --charset=noconv." 7175 echo "If you also have problems with iconv library functions use --charset=noconv."
7178 echo "Messages in the GTK-2 interface will be broken then." 7176 echo "Messages in the GTK-2 interface will be broken then."
7179 exit 1 7177 exit 1
7180 else 7178 else
7181 echores "yes" 7179 echores "yes"