configure without sdl iconv

This commit is contained in:
p.kosyh 2010-09-16 10:41:27 +00:00
parent e9649e0cbc
commit a264682b2f

View file

@ -109,33 +109,6 @@ fi
echo "ok"
rm -f /tmp/sdl-test.c /tmp/sdl-test
cat << EOF >/tmp/sdl-iconv.c
#include <SDL.h>
int main(int argc, char **argv)
{
#if defined(HAVE_ICONV) && !defined(HAVE_ICONV_H) && !defined(SDL_iconv_open)
SDL_iconv_open("","");
return 0;
#else
return 1;
#endif
}
EOF
echo $cc
echo -n "Checking SDL iconv...("
echo -n "$cc "`sdl-config --cflags` `sdl-config --libs`" /tmp/sdl-iconv.c -o iconv-test)..."
if ! $cc `sdl-config --cflags` `sdl-config --libs` /tmp/sdl-iconv.c -o /tmp/iconv-test || ! /tmp/iconv-test; then
echo "failed. Build without SDL iconv."
else
CFLAGS="$CFLAGS -D_HAVE_ICONV -D_SDL_ICONV"
echo "ok"
sdl_iconv="1"
fi
rm -f /tmp/sdl-iconv.c /tmp/iconv-test
if [[ "$sdl_iconv" != "1" ]]; then
cat << EOF >/tmp/iconv-test.c
#include <iconv.h>
int main(int argc, char **argv)
@ -160,7 +133,6 @@ else
fi
rm -f /tmp/iconv-test.c /tmp/iconv-test
fi
if ! make clean >/dev/null 2>&1; then
echo " * Warning!!! Can not do make clean..."