thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CONFIGURE: Check if iconv uses const.

Browse source 
I looked at how ResidualVM works with iconv and used a define
ICONV_USES_CONST, which they define in configure, thinking it is
defined by iconv. I a define of this into configure, so this
should fix the build error on osx_intel.
This commit is contained in:
Jaromir Wysoglad 2019-08-25 01:57:03 +02:00 • committed by David Turner
parent 96fef16693
commit e2ab8198a7
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
configure vendored
View file

@ -5240,6 +5240,20 @@ fi
if test "$_iconv" = yes ; then
append_var LIBS "$ICONV_LIBS -liconv"
append_var INCLUDES "$ICONV_CFLAGS"
# check if iconv uses const char** as it's second parameter
cat > $TMPC << EOF
#include <iconv.h>
int main(void) {
iconv_t conv = iconv_open("UTF-8//IGNORE", "CP850");
const char **inbuf = 0;
iconv(conv, inbuf, 0, 0, 0);
return 0;
}
EOF
_iconv_uses_const=no
cc_check $ICONV_CFLAGS $ICONV_LIBS -liconv && _iconv_uses_const=yes
define_in_config_if_yes "$_iconv_uses_const" 'ICONV_USES_CONST'
fi
define_in_config_if_yes "$_iconv" 'USE_ICONV'
echo "$_iconv"