From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Thu, 5 Dec 2002 11:05:38 +0000 (+0000)
Subject: * automake.in (handle_dist): Do not define %GETTEXT% if the user
X-Git-Tag: Release-1-7b~330
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=6a849e72251c35a5dbd6f3f099433ba5a9c7bb71;p=automake.git

* automake.in (handle_dist): Do not define %GETTEXT% if the user
is using $seen_gettext_external, this distcheck won't run
`./configure' with a meaningless `--with-included-gettext'.
* tests/gettext.test: Make sure distcheck uses --with-included-gettext.
* tests/gettext2.test: Make sure distcheck does not use
--with-included-gettext.
---

diff --git a/ChangeLog b/ChangeLog
index eedc424f..35a0c12d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2002-12-05  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* automake.in (handle_dist): Do not define %GETTEXT% if the user
+	is using $seen_gettext_external, this distcheck won't run
+	`./configure' with a meaningless `--with-included-gettext'.
+	* tests/gettext.test: Make sure distcheck uses --with-included-gettext.
+	* tests/gettext2.test: Make sure distcheck does not use
+	--with-included-gettext.
+
 	* m4/ccstdc.m4: Define am_cv_prog_cc_stdc for backward
 	compatibility and diagnose the use of AM_PROG_CC_STDC.
 	* automake.texi (Public macros) <AM_PROG_CC_STDC>: Remove
diff --git a/automake.in b/automake.in
index dbfe3485..59b41139 100755
--- a/automake.in
+++ b/automake.in
@@ -4269,7 +4269,7 @@ sub handle_dist
 
     # Rule to check whether a distribution is viable.
     my %transform = ('DISTCHECK-HOOK' => &target_defined ('distcheck-hook'),
-		     'GETTEXT'        => $seen_gettext);
+		     'GETTEXT' => $seen_gettext && !$seen_gettext_external);
 
     # Prepend $(distdir) to each directory given.
     my %rewritten = map { '$(distdir)/' . "$_" => 1 } keys %dist_dirs;
diff --git a/tests/gettext.test b/tests/gettext.test
index 186c62ed..2864a950 100755
--- a/tests/gettext.test
+++ b/tests/gettext.test
@@ -35,7 +35,6 @@ mkdir po intl
 
 $ACLOCAL
 
-
 # po/ and intl/ are required
 
 $AUTOMAKE --add-missing 2>stderr && exit 1
@@ -56,3 +55,6 @@ grep 'AM_GNU_GETTEXT.*po' stderr
 
 echo 'SUBDIRS = po intl' >Makefile.am
 $AUTOMAKE --add-missing
+
+# Make sure distcheck runs ./configure --with-included-gettext
+grep 'with-included-gettext' Makefile.in
diff --git a/tests/gettext2.test b/tests/gettext2.test
index 67fcabca..a074788e 100755
--- a/tests/gettext2.test
+++ b/tests/gettext2.test
@@ -51,3 +51,8 @@ grep 'AM_GNU_GETTEXT.*po' stderr
 
 echo 'SUBDIRS = po' >Makefile.am
 $AUTOMAKE --add-missing
+
+# Don't try running ./configure --with-included-gettext if the
+# user is using AM_GNU_GETTEXT([external]).
+grep 'with-included-gettext' Makefile.in && exit 1
+: