Mercurial > mplayer.hg
comparison configure @ 28904:69590d5c32cf
Fix compilation with --charset=noconv
| author | reimar |
|---|---|
| date | Fri, 13 Mar 2009 16:42:42 +0000 |
| parents | 88ac68461aae |
| children | c64bcd03ab34 |
comparison
equal
deleted
inserted
replaced
| 28903:1d34931ae1e6 | 28904:69590d5c32cf |
|---|---|
| 7766 def_gtk2='#undef CONFIG_GTK2' | 7766 def_gtk2='#undef CONFIG_GTK2' |
| 7767 fi #if test "$_gui" | 7767 fi #if test "$_gui" |
| 7768 # --------------- GUI specific tests end ------------------- | 7768 # --------------- GUI specific tests end ------------------- |
| 7769 | 7769 |
| 7770 | 7770 |
| 7771 if test "$_charset" = "noconv" ; then | 7771 if test "$_charset" != "noconv" ; then |
| 7772 _charset="" | |
| 7773 fi | |
| 7774 if test "$_charset" ; then | |
| 7775 def_charset="#define MSG_CHARSET \"$_charset\"" | 7772 def_charset="#define MSG_CHARSET \"$_charset\"" |
| 7776 else | 7773 else |
| 7777 def_charset="#undef MSG_CHARSET" | 7774 def_charset="#undef MSG_CHARSET" |
| 7775 _charset="UTF-8" | |
| 7778 fi | 7776 fi |
| 7779 | 7777 |
| 7780 if test -n "$_charset" && test "$_charset" != "UTF-8" ; then | 7778 if test -n "$_charset" && test "$_charset" != "UTF-8" ; then |
| 7781 echocheck "iconv program" | 7779 echocheck "iconv program" |
| 7782 iconv -f UTF-8 -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG" | 7780 iconv -f UTF-8 -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG" |