diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 19:11:58 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 19:11:58 +0100 |
| commit | 9853b168f68cbb09b75a817343cedde2aca4c76c (patch) | |
| tree | db628840acea83dbccaf5676b89579a80e02ef51 /gnulib-m4/iconv_open.m4 | |
| parent | d83e85a2e6064c36f6ad3c848e39d8b8c101c4f7 (diff) | |
| parent | 7cf710f6587e71a193a55d84dd6d8ae1a8a69ce0 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'gnulib-m4/iconv_open.m4')
| -rw-r--r-- | gnulib-m4/iconv_open.m4 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnulib-m4/iconv_open.m4 b/gnulib-m4/iconv_open.m4 index 1ed26cd8..c6fe346b 100644 --- a/gnulib-m4/iconv_open.m4 +++ b/gnulib-m4/iconv_open.m4 @@ -1,5 +1,5 @@ -# iconv_open.m4 serial 16 -dnl Copyright (C) 2007-2022 Free Software Foundation, Inc. +# iconv_open.m4 serial 17 +dnl Copyright (C) 2007-2024 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. @@ -16,7 +16,8 @@ AC_DEFUN([gl_FUNC_ICONV_OPEN], dnl We know that GNU libiconv and GNU libc do. AC_EGREP_CPP([gnu_iconv], [ #include <iconv.h> - #if defined _LIBICONV_VERSION || (defined __GLIBC__ && !defined __UCLIBC__) + #if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \ + || (defined __GLIBC__ && !defined __UCLIBC__) gnu_iconv #endif ], [gl_func_iconv_gnu=yes], [gl_func_iconv_gnu=no]) |