* tests/gettext.test: AM_PROG_GETTEXT of gettext >= 0.14.3

requires `config.rpath' to be present, and automake now enforces
this.  Test this, but only if the gettext installation works and
is recent enough to provide this diagnosis.
* tests/gettext.test: Provide a dummy `config.rpath' for all
subsequent checks.
* tests/gettext2.test, tests/subcond.test: Likewise.

diff --git a/ChangeLog b/ChangeLog
index ec0e7bc9cfe12213c7b0de8fce7998fd58e4b581..3eac3c842b9a527dbbdd069dd8c494a5a07c8675 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-06-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * tests/gettext.test: AM_PROG_GETTEXT of gettext >= 0.14.3
+       requires `config.rpath' to be present, and automake now enforces
+       this.  Test this, but only if the gettext installation works and
+       is recent enough to provide this diagnosis.
+       * tests/gettext.test: Provide a dummy `config.rpath' for all
+       subsequent checks.
+       * tests/gettext2.test, tests/subcond.test: Likewise.
+
        * tests/pr401.test: Replace "perl -i" with sed and mv, for
        MinGW perl.
        * tests/pr401b.test, tests/pr401c.test, tests/python11.test,

diff --git a/tests/gettext.test b/tests/gettext.test
index dd58985c93b03a04fc67154f15168c8c6ff7f8e1..c918662f33cd30413a07b505f93665cb57ea3424 100755 (executable)
--- a/tests/gettext.test
+++ b/tests/gettext.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2006  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -27,12 +27,34 @@ set -e
 
 cat >>configure.in <<END
 AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.14.3])
 AC_OUTPUT
 END
 
 : >Makefile.am
 mkdir po intl
 
+# config.rpath is required by versions >= 0.14.3.  We try to verify
+# this requirement, but only when we find we have a working and recent
+# gettext installation.
+
+# If aclocal fails here, it may be that gettext is too old to
+# provide AM_GNU_GETTEXT_VERSION.
+if $ACLOCAL; then
+
+  # autopoint will fail if it's from an older version.
+  # If gettext is too old to provide autopoint, this will
+  # fail as well, so we're safe here.
+  if autopoint -n; then
+    AUTOMAKE_fails --add-missing
+    grep 'required.*config.rpath' stderr
+  fi
+fi
+
+: >config.rpath
+sed '/AM_GNU_GETTEXT_VERSION/d' configure.in >configure.int
+mv -f configure.int configure.in
+
 $ACLOCAL
 
 # po/ and intl/ are required

diff --git a/tests/gettext2.test b/tests/gettext2.test
index bce0b48caf25ffc6851dccd440cb82e4ce180c5b..1d40bd58c380a6cb773692048126ab7a993dcd59 100755 (executable)
--- a/tests/gettext2.test
+++ b/tests/gettext2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2006  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -36,6 +36,9 @@ mkdir foo po
 
 $ACLOCAL
 
+# config.rpath is required.
+: >config.rpath
+
 # po/ is required, but intl/ isn't.
 
 AUTOMAKE_fails --add-missing

diff --git a/tests/subcond.test b/tests/subcond.test
index 746743dcced7356a8b75715dedb448d65d24148c..fdaa3179566566fa8e4557afcf5e6900b28fb208 100755 (executable)
--- a/tests/subcond.test
+++ b/tests/subcond.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2006  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -30,6 +30,7 @@ AC_SUBST(ALL_LINGUAS)
 END
 
 mkdir po intl
+: >config.rpath
 
 cat > Makefile.am << 'END'
 if MAUDE