gettext-related test failures: config.rpath presence

[Ralf Wildenhues]

CVS Automake diagnoses missing files mentioned in AC_REQUIRE_AUX_FILE
statements.  AM_GNU_GETTEXT of gettext >= 0.14.3 causes config.rpath
to be required through this mechanism:

| + automake-1.9a --foreign -Werror -Wall --add-missing
| configure.in:4: required file `./config.rpath' not found
| FAIL: gettext.test

One cheap way to ensure this is to provide dummy `config.rpath' files.

But then I got ambitious and tried to enable gettext.test to ensure that
the requirement is actually diagnosed when the gettext installation
works and is recent enough, while avoiding `autopoint' to modify our
test suite directory.

OK?

Cheers,
Ralf

        * 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.

Index: tests/gettext.test
===================================================================
RCS file: /cvs/automake/automake/tests/gettext.test,v
retrieving revision 1.6
diff -u -r1.6 gettext.test
--- tests/gettext.test  14 May 2005 20:28:55 -0000      1.6
+++ tests/gettext.test  10 May 2006 17:02:44 -0000
@@ -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 @@
 
 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
Index: tests/gettext2.test
===================================================================
RCS file: /cvs/automake/automake/tests/gettext2.test,v
retrieving revision 1.6
diff -u -r1.6 gettext2.test
--- tests/gettext2.test 14 May 2005 20:28:55 -0000      1.6
+++ tests/gettext2.test 10 May 2006 17:02:44 -0000
@@ -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 @@
 
 $ACLOCAL
 
+# config.rpath is required.
+: >config.rpath
+
 # po/ is required, but intl/ isn't.
 
 AUTOMAKE_fails --add-missing
Index: tests/subcond.test
===================================================================
RCS file: /cvs/automake/automake/tests/subcond.test,v
retrieving revision 1.3
diff -u -r1.3 subcond.test
--- tests/subcond.test  14 May 2005 20:28:56 -0000      1.3
+++ tests/subcond.test  10 May 2006 17:02:54 -0000
@@ -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 @@
 END
 
 mkdir po intl
+: >config.rpath
 
 cat > Makefile.am << 'END'
 if MAUDE