RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

fix detection of iconv implementations which require libdl 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16151 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
aurel 2005-07-30 01:07:27 +00:00
parent c95fe61fd8
commit c9215ede17
1 changed files with 54 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
configure vendored
View File

@ -2270,57 +2270,6 @@ else
fi
echocheck "iconv"
if test "$_iconv" = auto ; then
_iconv_tmp='#include <iconv.h>'
cat > $TMPC << EOF
#include <stdio.h>
#include <unistd.h>
$_iconv_tmp
#define INBUFSIZE 1024
#define OUTBUFSIZE 4096
char inbuffer[INBUFSIZE];
char outbuffer[OUTBUFSIZE];
int main(void) {
size_t numread;
iconv_t icdsc;
char *tocode="UTF-8";
char *fromcode="cp1250";
if ((icdsc = iconv_open (tocode, fromcode)) != (iconv_t)(-1)) {
while ((numread = read (0, inbuffer, INBUFSIZE))) {
char *iptr=inbuffer;
char *optr=outbuffer;
size_t inleft=numread;
size_t outleft=OUTBUFSIZE;
if (iconv(icdsc, (const char **)&iptr, &inleft, &optr, &outleft)
!= (size_t)(-1)) {
write (1, outbuffer, OUTBUFSIZE - outleft);
}
}
if (iconv_close(icdsc) == -1)
;
}
}
EOF
_iconv=no
if cc_check $_ld_lm ; then
_iconv=yes
elif cc_check $_ld_lm -liconv ; then
_iconv=yes
_ld_iconv='-liconv'
fi
fi
if test "$_iconv" = yes ; then
_def_iconv='#define USE_ICONV 1'
else
_def_iconv='#undef USE_ICONV'
fi
echores "$_iconv"
echocheck "langinfo"
if test "$_langinfo" = auto ; then
cat > $TMPC <<EOF
@ -2848,6 +2797,60 @@ else
fi
echocheck "iconv"
if test "$_iconv" = auto ; then
_iconv_tmp='#include <iconv.h>'
cat > $TMPC << EOF
#include <stdio.h>
#include <unistd.h>
$_iconv_tmp
#define INBUFSIZE 1024
#define OUTBUFSIZE 4096
char inbuffer[INBUFSIZE];
char outbuffer[OUTBUFSIZE];
int main(void) {
size_t numread;
iconv_t icdsc;
char *tocode="UTF-8";
char *fromcode="cp1250";
if ((icdsc = iconv_open (tocode, fromcode)) != (iconv_t)(-1)) {
while ((numread = read (0, inbuffer, INBUFSIZE))) {
char *iptr=inbuffer;
char *optr=outbuffer;
size_t inleft=numread;
size_t outleft=OUTBUFSIZE;
if (iconv(icdsc, (const char **)&iptr, &inleft, &optr, &outleft)
!= (size_t)(-1)) {
write (1, outbuffer, OUTBUFSIZE - outleft);
}
}
if (iconv_close(icdsc) == -1)
;
}
}
EOF
_iconv=no
if cc_check $_ld_lm ; then
_iconv=yes
elif cc_check $_ld_lm -liconv ; then
_iconv=yes
_ld_iconv='-liconv'
elif cc_check $_ld_lm -liconv $_ld_dl ; then
_iconv=yes
_ld_iconv='-liconv $_ld_dl'
fi
fi
if test "$_iconv" = yes ; then
_def_iconv='#define USE_ICONV 1'
else
_def_iconv='#undef USE_ICONV'
fi
echores "$_iconv"
echocheck "sys/soundcard.h"
cat > $TMPC << EOF
#include <sys/soundcard.h>