[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: don't distcheck with --with-included-gettext if AM_GNU_GETTEXT([ext
From: |
Alexandre Duret-Lutz |
Subject: |
FYI: don't distcheck with --with-included-gettext if AM_GNU_GETTEXT([externa]) is used |
Date: |
Thu, 05 Dec 2002 12:04:46 +0100 |
User-agent: |
Gnus/5.090008 (Oort Gnus v0.08) Emacs/20.7 (i386-debian-linux-gnu) |
I'm checking this in (HEAD & branch-1-7).
2002-12-05 Alexandre Duret-Lutz <address@hidden>
* 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.
Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.198.2.15
diff -u -r1.198.2.15 NEWS
--- NEWS 5 Dec 2002 09:31:29 -0000 1.198.2.15
+++ NEWS 5 Dec 2002 11:00:18 -0000
@@ -1,4 +1,6 @@
Bugs fixed in 1.7.1c:
+* Do not run `./configure --with-included-gettext' during `make distcheck'
+ if AM_GNU_GETTEXT([external]) is used.
* Correctly uninstall renamed man pages.
* Do not strip escaped newline in variables defined in one condition
and augmented in another condition.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1365.2.24
diff -u -r1.1365.2.24 automake.in
--- automake.in 4 Dec 2002 20:23:58 -0000 1.1365.2.24
+++ automake.in 5 Dec 2002 11:00:45 -0000
@@ -4217,7 +4217,7 @@
# 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;
Index: tests/gettext.test
===================================================================
RCS file: /cvs/automake/automake/tests/gettext.test,v
retrieving revision 1.2
diff -u -r1.2 gettext.test
--- tests/gettext.test 8 Sep 2002 13:07:55 -0000 1.2
+++ tests/gettext.test 5 Dec 2002 11:00:45 -0000
@@ -35,7 +35,6 @@
$ACLOCAL
-
# po/ and intl/ are required
$AUTOMAKE --add-missing 2>stderr && exit 1
@@ -56,3 +55,6 @@
echo 'SUBDIRS = po intl' >Makefile.am
$AUTOMAKE --add-missing
+
+# Make sure distcheck runs ./configure --with-included-gettext
+grep 'with-included-gettext' Makefile.in
Index: tests/gettext2.test
===================================================================
RCS file: /cvs/automake/automake/tests/gettext2.test,v
retrieving revision 1.2
diff -u -r1.2 gettext2.test
--- tests/gettext2.test 8 Sep 2002 13:07:55 -0000 1.2
+++ tests/gettext2.test 5 Dec 2002 11:00:45 -0000
@@ -51,3 +51,8 @@
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
+:
--
Alexandre Duret-Lutz
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: don't distcheck with --with-included-gettext if AM_GNU_GETTEXT([externa]) is used,
Alexandre Duret-Lutz <=