From 35b1708c3961dce31e4ce43014e71d77aa4b5e31 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Mon, 4 Jan 2021 17:27:37 -0500 Subject: =?UTF-8?q?autoreconf:=20don=E2=80=99t=20error=20out=20when=20AM?= =?UTF-8?q?=5FGNU=5FGETTEXT=20is=20used=20alone.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some projects intentionally don't call AM_GNU_GETTEXT_(REQUIRE_)VERSION because they have all of the gettext infrastructure checked into version control and they want autoreconf to _not_ run autopoint. Therefore, make the “AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_(REQUIRE_)VERSION” and “AM_GNU_GETTEXT_(REQUIRE_)VERSION is used, but not AM_GNU_GETTEXT” diagnostics be warnings again, as they were in 2.69. (Technically these diagnostics were always errors, in the sense that they were reported with a call to Autom4te::Channels::error(), but prior to 2.70, error() calls made by autoreconf did not cause autoreconf to exit unsuccessfully, due to an unrelated bug. So people came to depend on these diagnostics not being fatal.) --- bin/autoreconf.in | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/bin/autoreconf.in b/bin/autoreconf.in index bb9f316d..9855efbe 100644 --- a/bin/autoreconf.in +++ b/bin/autoreconf.in @@ -644,14 +644,18 @@ sub autoreconf_current_directory ($) } } - # Gettext consistency checks... - error($configure_ac, - "AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION" - . " or AM_GNU_GETTEXT_REQUIRE_VERSION") + # Gettext consistency checks. + # Some projects intentionally don't call AM_GNU_GETTEXT_(REQUIRE_)VERSION + # because they have all of the gettext infrastructure checked into version + # control and they want us to _not_ run autopoint. Therefore, these + # diagnostics are only warnings. + msg('syntax', $configure_ac, + "AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION" + . " or AM_GNU_GETTEXT_REQUIRE_VERSION") if $uses_gettext_via_traces && ! $uses_gettext; - error($configure_ac, - "AM_GNU_GETTEXT_VERSION or AM_GNU_GETTEXT_REQUIRE_VERSION is used," - . " but not AM_GNU_GETTEXT") + msg('syntax', $configure_ac, + "AM_GNU_GETTEXT_VERSION or AM_GNU_GETTEXT_REQUIRE_VERSION is used," + . " but not AM_GNU_GETTEXT") if $uses_gettext && ! $uses_gettext_via_traces; -- cgit v1.2.1