From: Bruno Haible <bruno@clisp.org>
Date: Tue, 1 Jul 2025 23:12:21 +0000 (+0200)
Subject: Merge from 0.25.x branch: Prepare for 0.25.1 release.
X-Git-Tag: v0.26~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=027f0c7047a2f7a8fc9a83dd74d0a0b44984c849;p=thirdparty%2Fgettext.git

Merge from 0.25.x branch: Prepare for 0.25.1 release.

* gettext-tools/misc/autopoint.in: Accept versions 0.23.2, 0.24.2, 0.25.1.
* gettext-tools/configure.ac (ARCHIVE_VERSION): Bump to 0.25.1.
* NEWS: Update.
---

diff --git a/NEWS b/NEWS
index f6ebce9c6..0122a7821 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,12 @@ Version 0.26 - July 2025
     in libc of Solaris 11.[0-3], Solaris OpenIndiana, and Solaris OmniOS.
   - The AM_GNU_GETTEXT macro now recognizes, on MSVC, the GNU libintl built
     as a shared library.
+  - autopoint no longer fails if configure.ac contains no
+    AM_GNU_GETTEXT_VERSION or AM_GNU_GETTEXT_REQUIRE_VERSION invocation.
+  - nls.m4 is installed again under $PREFIX/share/aclocal/.
+
+# Portability:
+  - Building on native Windows with MSVC and --enable-shared is now supported.
 
 Version 0.25 - May 2025
 
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 659e7e8c0..5c53cdb0f 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -623,7 +623,7 @@ fi
 AC_SUBST([ARCHIVE_FORMAT])
 
 dnl Get versions of files brought in by autopull.sh.
-ARCHIVE_VERSION=0.25
+ARCHIVE_VERSION=0.25.1
 AC_SUBST([ARCHIVE_VERSION])
 dnl We don't offer a --with-tree-sitter-prefix option, but instead always use
 dnl the tree-sitter version included in the tarball. This is required because
diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index f32b1930b..02c70a4b1 100644
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -401,9 +401,9 @@ case "$ver" in
   0.20 | 0.20.2 | \
   0.21 | 0.21.1 | \
   0.22 | 0.22.1 | 0.22.2 | 0.22.3 | 0.22.4 | 0.22.5 | \
-  0.23 | 0.23.1 | \
-  0.24 | 0.24.1 | \
-  0.25 )
+  0.23 | 0.23.1 | 0.23.2 | \
+  0.24 | 0.24.1 | 0.24.2 | \
+  0.25 | 0.25.1 )
     ;;
   *)
     func_fatal_error "The AM_GNU_GETTEXT_VERSION declaration in your $configure_in