From: Bruce Rogers <brog...@suse.com> It isn't necessarily the case that use of iconv requires an additional library. For that reason we shouldn't conditionalize iconv detection on libiconv.found.
Fixes: 5285e593c33 (configure: Fixes ncursesw detection under msys2/mingw by convert them to meson) Signed-off-by: Bruce Rogers <brog...@suse.com> Reviewed-by: Yonggang Luo<l <brog...@suse.com>uoyongg...@gmail.com> Reviewed-by:Yonggang Luo <luoyongg...@gmail.com> Message-Id: <20201014221939.196958-1-brog...@suse.com> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- meson.build | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index 0c0f4f9fd8..c1c45e9845 100644 --- a/meson.build +++ b/meson.build @@ -459,15 +459,13 @@ if not get_option('iconv').disabled() libiconv = cc.find_library('iconv', required: false, static: enable_static) - if libiconv.found() - if cc.links(''' - #include <iconv.h> - int main(void) { - iconv_t conv = iconv_open("WCHAR_T", "UCS-2"); - return conv != (iconv_t) -1; - }''', dependencies: [libiconv]) - iconv = declare_dependency(dependencies: [libiconv]) - endif + if cc.links(''' + #include <iconv.h> + int main(void) { + iconv_t conv = iconv_open("WCHAR_T", "UCS-2"); + return conv != (iconv_t) -1; + }''', dependencies: [libiconv]) + iconv = declare_dependency(dependencies: [libiconv]) endif endif if get_option('iconv').enabled() and not iconv.found() -- 2.26.2