Merge branch 'v0.21.x' into master

2020-09-04 18:35:21 +02:00
parent 9aa432c078 db8b419b8c
commit 67c7116f05
17 changed files with 185 additions and 110 deletions
--- a/src/lib/icu/meson.build
+++ b/src/lib/icu/meson.build
@@ -18,7 +18,7 @@ if icu_dep.found()
    'Init.cxx',
  ]
 elif not get_option('iconv').disabled()
-  have_iconv = compiler.has_function('iconv')
+  have_iconv = compiler.has_function('iconv', prefix : '#include <iconv.h>')
  conf.set('HAVE_ICONV', have_iconv)
  if not have_iconv and get_option('iconv').enabled()
    error('iconv() not available')