summaryrefslogtreecommitdiff
path: root/gnulib-m4/iconv.m4
diff options
context:
space:
mode:
Diffstat (limited to 'gnulib-m4/iconv.m4')
-rw-r--r--gnulib-m4/iconv.m411
1 files changed, 6 insertions, 5 deletions
diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4
index b414bfca..f2b0c37d 100644
--- a/gnulib-m4/iconv.m4
+++ b/gnulib-m4/iconv.m4
@@ -1,10 +1,11 @@
# iconv.m4
-# serial 28
-dnl Copyright (C) 2000-2002, 2007-2014, 2016-2024 Free Software Foundation,
+# serial 32
+dnl Copyright (C) 2000-2002, 2007-2014, 2016-2025 Free Software Foundation,
dnl 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.
+dnl This file is offered as-is, without any warranty.
dnl From Bruno Haible.
@@ -27,8 +28,8 @@ AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
AC_DEFUN([AM_ICONV_LINK],
[
- dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
- dnl those with the standalone portable GNU libiconv installed).
+ dnl Some systems have iconv in libc, some have it in libiconv (those
+ dnl with the standalone portable GNU libiconv installed).
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
@@ -208,7 +209,7 @@ AC_DEFUN([AM_ICONV_LINK],
{
/* Try standardized names. */
iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
- /* Try IRIX, OSF/1 names. */
+ /* Try possible *BSD names. */
iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
/* Try AIX names. */
iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");