From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 10 Aug 2012 14:29:58 +0000 (+0200)
Subject: [ng] distcheck: --with-included-gettext: with a variable, not a transform
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4100c2baf7640c77d31578edb5001545a25cbec1;p=thirdparty%2Fautomake.git

[ng] distcheck: --with-included-gettext: with a variable, not a transform

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 <stefano.lattarini@gmail.com>
---

diff --git a/automake.in b/automake.in
index 247da2314..a7f423b97 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 813506283..844515e35 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.