From e2ab8198a79a79a389db0debee9e774df6dc2ee4 Mon Sep 17 00:00:00 2001 From: Jaromir Wysoglad Date: Sun, 25 Aug 2019 01:57:03 +0200 Subject: CONFIGURE: Check if iconv uses const. 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. --- configure | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'configure') diff --git a/configure b/configure index b458004f12..62eeee9fbf 100755 --- a/configure +++ b/configure @@ -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 +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" -- cgit v1.2.3