From: Bruno Haible <bruno@clisp.org>
Date: Sat, 31 May 2025 13:24:26 +0000 (+0200)
Subject: build: Mark automake 1.18 as supported.
X-Git-Tag: v0.26~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f744352a02ea1a6dd97615901d21ef5244984b40;p=thirdparty%2Fgettext.git

build: Mark automake 1.18 as supported.

* autogen.sh: Update comment.
* m4/fixautomake.m4 (FIX_MAKEFILE_DISTRIB): Likewise.
---

diff --git a/autogen.sh b/autogen.sh
index 109df67d1..4dfd5d94b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
 # also regenerates all aclocal.m4, config.h.in, Makefile.in, configure files
 # with new versions of autoconf or automake.
 #
-# This script requires autoconf-2.64..2.72 and automake-1.13..1.17 in the PATH.
+# This script requires autoconf-2.64..2.72 and automake-1.13..1.18 in the PATH.
 
 # Copyright (C) 2003-2025 Free Software Foundation, Inc.
 #
diff --git a/m4/fixautomake.m4 b/m4/fixautomake.m4
index bc98541a5..7798781d1 100644
--- a/m4/fixautomake.m4
+++ b/m4/fixautomake.m4
@@ -1,6 +1,6 @@
 # fixautomake.m4
-# serial 9 (gettext-0.23)
-dnl Copyright (C) 2002-2024 Free Software Foundation, Inc.
+# serial 9 (gettext-0.26)
+dnl Copyright (C) 2002-2025 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -15,7 +15,7 @@ AC_DEFUN([FIX_MAKEFILE_DISTRIB], [
   mv $ac_file.tmp $ac_file
 ])
 
-dnl Fix an automake-1.9-1.17 bug: the distrib rule is not extensible.
+dnl Fix an automake-1.9-1.18 bug: the distrib rule is not extensible.
 dnl Insert a invocation of the distdir1 target inside the distdir commands,
 dnl after $(distdir) has been erased and re-created.
 AC_DEFUN([FIX_MAKEFILE_TOPDIR_DISTRIB], [