Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv944 Modified Files: configure subreader.c Log Message: FreeBSD iconv change/fix Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.548 retrieving revision 1.549 diff -u -r1.548 -r1.549 --- configure 28 Aug 2002 20:51:58 -0000 1.548 +++ configure 28 Aug 2002 23:00:24 -0000 1.549 @@ -3527,11 +3527,8 @@ echocheck "iconv" if test "$_iconv" = auto ; then - if freebsd ; then - _iconv_tmp='#include <giconv.h>' - else - _iconv_tmp='#include <iconv.h>' - fi + _iconv_tmp='#include <iconv.h>' + cat > $TMPC << EOF #include <stdio.h> #include <unistd.h> @@ -3564,9 +3561,7 @@ } EOF _iconv=no - if freebsd ; then - cc_check -lm -lgiconv && _iconv=yes - elif bsdos || openbsd ; then + if freebsd || bsdos || openbsd ; then cc_check -lm -liconv && _iconv=yes else cc_check -lm && _iconv=yes @@ -3574,7 +3569,7 @@ fi if test "$_iconv" = yes ; then _def_iconv='#define USE_ICONV 1' - freebsd && _ld_iconv='-lgiconv' + freebsd && _ld_iconv='-liconv' bsdos && _ld_iconv='-liconv' openbsd && _ld_iconv='-liconv' else Index: subreader.c =================================================================== RCS file: /cvsroot/mplayer/main/subreader.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- subreader.c 25 Jul 2002 18:05:08 -0000 1.67 +++ subreader.c 28 Aug 2002 23:00:24 -0000 1.68 @@ -19,11 +19,7 @@ #define ERR ((void *) -1) #ifdef USE_ICONV -#ifdef __FreeBSD__ -#include <giconv.h> -#else #include <iconv.h> -#endif char *sub_cp=NULL; #endif