This is mostly a preparatory refactoring in view of future changes. * automake.in (handle_dist): Define the new internal variable 'am.dist.handle-gettext' to "yes" if the package uses gettext, to the empty string otherwise. This takes over the role of the transform 'GETTEXT', which has thus been removed. * lib/am/distdir.am (distcheck): Adjust to rely on the new variable instead than of the removed transform.
Signed-off-by: Stefano Lattarini <[email protected]> --- automake.in | 3 ++- lib/am/distdir.am | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/automake.in b/automake.in index 247da23..a7f423b 100644 --- a/automake.in +++ b/automake.in @@ -3285,7 +3285,8 @@ sub handle_dist () define_variable ('am.dist.handle-distcheck-hook', INTERNAL, rule ('distcheck-hook') ? 'yes' : ''); - $transform{'GETTEXT'} = $seen_gettext && !$seen_gettext_external; + define_variable ('am.dist.handle-gettext', INTERNAL, + $seen_gettext && !$seen_gettext_external ? 'yes' : ''); # If the target 'dist-hook' exists, make sure it is run. This # allows users to do random weird things to the distribution diff --git a/lib/am/distdir.am b/lib/am/distdir.am index 8135062..844515e 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -446,7 +446,7 @@ distcheck: dist $(if $(am.dist.handle-distcheck-hook),&& $(MAKE) distcheck-hook) \ && cd $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ -?GETTEXT? --with-included-gettext \ + $(if $(am.dist.handle-gettext),--with-included-gettext) \ ## Additional flags for configure. Keep this last in the configure ## invocation so the developer and user can override previous options, ## and let the user's flags take precedence over the developer's ones. -- 1.7.12.rc0
