aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorJaromir Wysoglad2019-08-19 18:15:23 +0200
committerFilippos Karapetis2019-08-24 18:12:45 +0300
commit4de634ee7646410eb8f330f6974f9ee8eb594b1f (patch)
tree743379d465a6c9ddc57850f0e22f39e25bff60d7 /configure
parentf2715d77ed379317c9068c1244c9517dd16cc99b (diff)
downloadscummvm-rg350-4de634ee7646410eb8f330f6974f9ee8eb594b1f.tar.gz
scummvm-rg350-4de634ee7646410eb8f330f6974f9ee8eb594b1f.tar.bz2
scummvm-rg350-4de634ee7646410eb8f330f6974f9ee8eb594b1f.zip
CONFIGURE: Move check for iconv down
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure38
1 files changed, 19 insertions, 19 deletions
diff --git a/configure b/configure
index 419c93db0b..b458004f12 100755
--- a/configure
+++ b/configure
@@ -4218,25 +4218,6 @@ 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
#
echocheck "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