Skip to content

Commit

Permalink
autoreconf: don’t error out when AM_GNU_GETTEXT is used alone.
Browse files Browse the repository at this point in the history
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.)
  • Loading branch information
zackw committed Jan 4, 2021
1 parent fbcc365 commit 66fdaea
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions bin/autoreconf.in
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down

0 comments on commit 66fdaea

Please sign in to comment.