summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--m4/iconv.m48
2 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a8f0007ca6..21c9451313 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2022-07-10 Bruno Haible <bruno@clisp.org>
+ iconv: Remove obsolete comment.
+ * m4/iconv.m4 (AM_ICONV): Remove comment that is obsolete since
+ 2020-08-16.
+
+2022-07-10 Bruno Haible <bruno@clisp.org>
+
announce-gen: Fix internationalization in verification instructions.
* build-aux/announce-gen: Set LC_ALL, not LANG, to "C", to force English
output from gpg.
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 00057953e3..6f1ae2b13d 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,4 +1,4 @@
-# iconv.m4 serial 24
+# iconv.m4 serial 25
dnl Copyright (C) 2000-2002, 2007-2014, 2016-2022 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
@@ -234,12 +234,6 @@ AC_DEFUN([AM_ICONV_LINK],
dnl Define AM_ICONV using AC_DEFUN_ONCE, in order to avoid warnings like
dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
-dnl This is tricky because of the way 'aclocal' is implemented:
-dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
-dnl Otherwise aclocal's initial scan pass would miss the macro definition.
-dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
-dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
-dnl warnings.
AC_DEFUN_ONCE([AM_ICONV],
[
AM_ICONV_LINK