aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Crozat2010-06-17 18:54:37 +0000
committerThierry Crozat2010-06-17 18:54:37 +0000
commit690203de7486b577dc8b34d1a2fa8b97b686d2f9 (patch)
tree60cee11dea4fcaa8ba4928e052b33b73f8c5e514
parentb56b3b9eadd82685da6f8973bc8775176e67f1ff (diff)
downloadscummvm-rg350-690203de7486b577dc8b34d1a2fa8b97b686d2f9.tar.gz
scummvm-rg350-690203de7486b577dc8b34d1a2fa8b97b686d2f9.tar.bz2
scummvm-rg350-690203de7486b577dc8b34d1a2fa8b97b686d2f9.zip
Fix possible link error for scummvm-static (for MacOS X bundle) when USE_TRANSLATION is set but USE_TERMCONV is not.
svn-id: r49941
-rwxr-xr-xconfigure1
-rw-r--r--ports.mk2
2 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index 41e6a46f44..eeec7df204 100755
--- a/configure
+++ b/configure
@@ -2351,6 +2351,7 @@ EOF
cc_check_no_clean $LDFLAGS $CXXFLAGS && _termconv=yes
cc_check $LDFLAGS $CXXFLAGS -liconv && LIBS="$LIBS -liconv" && _termconv=yes
+ add_to_config_mk_if_yes $_termconv 'USE_TERMCONV = 1'
add_to_config_h_if_yes $_termconv '#define USE_TERMCONV'
if test "$_termconv" = yes ; then
uses_const=no
diff --git a/ports.mk b/ports.mk
index 0feaacbea3..a7ad8febfe 100644
--- a/ports.mk
+++ b/ports.mk
@@ -101,7 +101,7 @@ ifdef USE_ZLIB
OSX_ZLIB ?= -lz
endif
-ifdef USE_TRANSLATION
+ifdef USE_TERMCONV
OSX_ICONV ?= -liconv
endif