libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-11-27 03:10:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CONFIGURE: Move check for iconv down

Browse Source
This commit is contained in:
Jaromir Wysoglad 2019-08-19 18:15:23 +02:00 committed by Filippos Karapetis
parent f2715d77ed
commit 4de634ee76
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
configure vendored
View File

@ -4217,25 +4217,6 @@ fi
define_in_config_if_yes "$_vorbis" 'USE_VORBIS'
echo "$_vorbis"
#
# Check for iconv
#
echocheck "Iconv"
if test "$_iconv" = auto ; then
_iconv=no
cat > $TMPC << EOF
#include <iconv.h>
int main(void) { iconv_t conv = iconv_open("UTF-8//IGNORE", "CP850"); return 0; }
EOF
cc_check $ICONV_CFLAGS $ICONV_LIBS -liconv && _iconv=yes
fi
if test "$_iconv" = yes ; then
append_var LIBS "$ICONV_LIBS -liconv"
append_var INCLUDES "$ICONV_CFLAGS"
fi
define_in_config_if_yes "$_iconv" 'USE_ICONV'
echo "$_iconv"
#
# Check for Tremor
#
@ -5244,6 +5225,25 @@ if test "$_pandocext" = "default"; then
_pandocext=".$_pandocformat"
fi
fi
#
# Check for iconv
#
echocheck "Iconv"
if test "$_iconv" = auto ; then
_iconv=no
cat > $TMPC << EOF
#include <iconv.h>
int main(void) { iconv_t conv = iconv_open("UTF-8//IGNORE", "CP850"); return 0; }
EOF
cc_check $ICONV_CFLAGS $ICONV_LIBS -liconv && _iconv=yes
fi
if test "$_iconv" = yes ; then
append_var LIBS "$ICONV_LIBS -liconv"
append_var INCLUDES "$ICONV_CFLAGS"
fi
define_in_config_if_yes "$_iconv" 'USE_ICONV'
echo "$_iconv"
#
# Enable vkeybd / keymapper / event recorder