diff options
| author | nexus <nexus@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-28 23:00:25 +0000 |
|---|---|---|
| committer | nexus <nexus@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-28 23:00:25 +0000 |
| commit | af4654d926f6bf8c0dccb7e97075bfbc8dee161b (patch) | |
| tree | dad7446d93bf927d56954495b411110b7daac212 /configure | |
| parent | 0f4f7e27cfb46b45c558a35f01f400f193e9bc7b (diff) | |
| download | mpv-af4654d926f6bf8c0dccb7e97075bfbc8dee161b.tar.bz2 mpv-af4654d926f6bf8c0dccb7e97075bfbc8dee161b.tar.xz | |
FreeBSD iconv change/fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7129 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 13 |
1 files changed, 4 insertions, 9 deletions
@@ -3527,11 +3527,8 @@ fi 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 @@ int main(void) { } 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 @@ EOF 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 |