mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r14515) -Fix (r7759): iconv is included in glibc-2.1 and higher, so we don't need to link to a most likely non-existing libiconv in those situations.

This commit is contained in:
rubidium 2008-10-22 20:20:08 +00:00
parent c10f7db576
commit fcb6f0bafe
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
config.lib
View File

@ -1276,10 +1276,12 @@ make_cflags_and_ldflags() {
if [ "$with_iconv" != "0" ]; then
CFLAGS="$CFLAGS -DWITH_ICONV"
LIBS="$LIBS -liconv"
if [ "$with_iconv" != "2" ]; then
CFLAGS="$CFLAGS -I$with_iconv/include"
LIBS="$LIBS -L$with_iconv/lib"
if [ "$link_to_iconv" = "yes" ]; then
LIBS="$LIBS -liconv"
if [ "$with_iconv" != "2" ]; then
CFLAGS="$CFLAGS -I$with_iconv/include"
LIBS="$LIBS -L$with_iconv/lib"
fi
fi
if [ "$have_broken_iconv" != "no" ]; then
@ -2297,6 +2299,27 @@ EOF
log 2 " exit code $ret"
if [ "$ret" = "0" ]; then have_broken_iconv="no"; else have_broken_iconv="yes"; fi
log 1 "checking if iconv has non-const inbuf... $have_broken_iconv"
cat > tmp.iconv.cpp << EOF
#include "src/stdafx.h"
#include <iconv.h>
int main() {
static char buf[1024];
iconv_t convd = 0;
char *inbuf = "";
char *outbuf = buf;
size_t outlen = 1023;
size_t inlen = 0;
return iconv(convd, &inbuf, &inlen, &outbuf, &outlen);
}
EOF
execute="$cxx_host $CFLAGS tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1"
eval $execute >&/dev/null
ret=$?
log 2 "executing $execute"
log 2 " exit code $ret"
if [ "$ret" = "0" ]; then link_to_iconv="no"; else link_to_iconv="yes"; fi
log 1 "checking whether to link to iconv... $link_to_iconv"
rm -f tmp.iconv tmp.iconv.cpp
}