diff options
| author | Andy Wingo <wingo@pobox.com> | 2021-01-20 21:52:54 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2021-01-20 23:03:56 +0100 |
| commit | a91b95cca2d397c84f8b9bbd602d40209a7092ce (patch) | |
| tree | 2c286a291f5a2b812d6e216be10936f2709d59cf /m4/iconv_open-utf.m4 | |
| parent | 758b31994cff582c7e8785b4cc2240dbf3573837 (diff) | |
| download | guile-a91b95cca2d397c84f8b9bbd602d40209a7092ce.tar.gz | |
Update Gnulib to v0.1-4379-g2ef5a9b4b
Also bump required autoconf version to 2.64, as required by Gnulib.
Diffstat (limited to 'm4/iconv_open-utf.m4')
| -rw-r--r-- | m4/iconv_open-utf.m4 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/m4/iconv_open-utf.m4 b/m4/iconv_open-utf.m4 index 4a3211cee..68efaf9da 100644 --- a/m4/iconv_open-utf.m4 +++ b/m4/iconv_open-utf.m4 @@ -1,5 +1,5 @@ -# iconv_open-utf.m4 serial 1 -dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. +# iconv_open-utf.m4 serial 4 +dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -211,16 +211,18 @@ int main () [gl_cv_func_iconv_supports_utf=yes], [gl_cv_func_iconv_supports_utf=no], [ - dnl We know that GNU libiconv, GNU libc, and Solaris >= 9 do. + dnl We know that GNU libiconv, GNU libc, musl libc, and Solaris >= 9 do. dnl OSF/1 5.1 has these encodings, but inserts a BOM in the "to" dnl direction. - gl_cv_func_iconv_supports_utf=no + gl_cv_func_iconv_supports_utf="$gl_cross_guess_normal" if test $gl_func_iconv_gnu = yes; then - gl_cv_func_iconv_supports_utf=yes + gl_cv_func_iconv_supports_utf="guessing yes" else changequote(,)dnl case "$host_os" in - solaris2.9 | solaris2.1[0-9]) gl_cv_func_iconv_supports_utf=yes ;; + *-musl*) gl_cv_func_iconv_supports_utf="guessing yes" ;; + solaris2.9 | solaris2.1[0-9]) + gl_cv_func_iconv_supports_utf="guessing yes" ;; esac changequote([,])dnl fi |