From: Bruno Haible <bruno@clisp.org>
Date: Wed, 5 Nov 2025 14:01:12 +0000 (+0100)
Subject: autopoint: Diagnose multiple invocations of AM_GNU_GETTEXT_VERSION.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f23092fe8301c65e5765458fa36a53e7f9c5d92;p=thirdparty%2Fgettext.git

autopoint: Diagnose multiple invocations of AM_GNU_GETTEXT_VERSION.

Reported by Santiago Vila in
<https://lists.gnu.org/archive/html/bug-gettext/2025-11/msg00001.html>.

* gettext-tools/autotools/autopoint.in: Report an error if "$xreq" or "$xver"
consists of more than one line.
---

diff --git a/gettext-tools/autotools/autopoint.in b/gettext-tools/autotools/autopoint.in
index 7bf6ed03d..8c3733bf4 100644
--- a/gettext-tools/autotools/autopoint.in
+++ b/gettext-tools/autotools/autopoint.in
@@ -341,10 +341,18 @@ func_version_prereq ()
 # If AM_GNU_GETTEXT_REQUIRE_VERSION is used and archive_version is newer than
 # that, use archive_version.
 xreq=`func_trace_sed AM_GNU_GETTEXT_REQUIRE_VERSION "$configure_in"`
+case "$xreq" in
+  *'
+'*) func_fatal_error "found more than one invocation of AM_GNU_GETTEXT_REQUIRE_VERSION" ;;
+esac
 
 # Need to use func_trace_sed instead of $func_trace, since
 # AM_GNU_GETTEXT_VERSION is not a standard Autoconf trace.
 xver=`func_trace_sed AM_GNU_GETTEXT_VERSION "$configure_in"`
+case "$xver" in
+  *'
+'*) func_fatal_error "found more than one invocation of AM_GNU_GETTEXT_VERSION" ;;
+esac
 
 # Prefer AM_GNU_GETTEXT_REQUIRE_VERSION over AM_GNU_GETTEXT_VERSION if both are
 # specified.