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
# 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;
$ACLOCAL
-
# po/ and intl/ are required
$AUTOMAKE --add-missing 2>stderr && exit 1
echo 'SUBDIRS = po intl' >Makefile.am
$AUTOMAKE --add-missing
+
+# Make sure distcheck runs ./configure --with-included-gettext
+grep 'with-included-gettext' Makefile.in
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
+: