Merge tag 'v0.21.16'

release v0.21.16
2019-10-16 12:03:12 +02:00
parent b2c4a5db14 9b95e65bd9
commit e1867a99e9
12 changed files with 249 additions and 38 deletions
--- a/src/lib/icu/meson.build
+++ b/src/lib/icu/meson.build
@@ -20,7 +20,7 @@ if icu_dep.found()
 elif not get_option('iconv').disabled()
  have_iconv = compiler.has_function('iconv')
  conf.set('HAVE_ICONV', have_iconv)
-  if get_option('iconv').enabled()
+  if not have_iconv and get_option('iconv').enabled()
    error('iconv() not available')
  endif
 endif