comparison configure @ 18673:02e837b23337

Do not require iconv program with --charset=noconv
author reimar
date Sat, 10 Jun 2006 20:11:38 +0000
parents 56ebaaf3500e
children 86020c65b1d5
comparison
equal deleted inserted replaced
18672:f3b0eea2ae9a 18673:02e837b23337
7112 _def_charset="#define MSG_CHARSET \"$_charset\"" 7112 _def_charset="#define MSG_CHARSET \"$_charset\""
7113 else 7113 else
7114 _def_charset="#undef MSG_CHARSET" 7114 _def_charset="#undef MSG_CHARSET"
7115 fi 7115 fi
7116 7116
7117 if test "$_charset" = `cat ${_mp_help}.charset` ; then
7118 # hack to disable conversion in the Makefile
7119 _charset=""
7120 fi
7121
7122 if test "$_charset" ; then
7117 echocheck "iconv program" 7123 echocheck "iconv program"
7118 iconv -f `cat ${_mp_help}.charset` -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG" 7124 iconv -f `cat ${_mp_help}.charset` -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG"
7119 if test "$?" -ne 0 ; then 7125 if test "$?" -ne 0 ; then
7120 echores "no" 7126 echores "no"
7121 if test "$_charset" != `cat ${_mp_help}.charset` ; then
7122 echo "No working iconv program found, use " 7127 echo "No working iconv program found, use "
7123 echo "--charset=`cat ${_mp_help}.charset` to continue anyway." 7128 echo "--charset=`cat ${_mp_help}.charset` to continue anyway."
7129 echo "If you also have problems with iconv library functions use --charset=noconv."
7124 echo "Messages in the GTK-2 interface will be broken then." 7130 echo "Messages in the GTK-2 interface will be broken then."
7125 exit 1 7131 exit 1
7126 fi
7127 else 7132 else
7128 echores "yes" 7133 echores "yes"
7129 fi 7134 fi
7130
7131 if test "$_charset" = `cat ${_mp_help}.charset` ; then
7132 # hack to disable conversion in the Makefile
7133 _charset=""
7134 fi 7135 fi
7135 7136
7136 ############################################################################# 7137 #############################################################################
7137 7138
7138 echocheck "automatic gdb attach" 7139 echocheck "automatic gdb attach"