Don't grep config.status.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 51ac851038b9e73bd2e7e2f470e4c2903eee0108..f8ba4ee1c6d32f55a0bea116807e51826ad37bb1 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,14 @@
+2006-12-16  Bruno Haible  <bruno@clisp.org>
+
+       Make it work with autoconf > 2.61.
+       * Makefile.am (TESTS_ENVIRONMENT): Also set GLIBC2.
+       * gettext-3: Use GLIBC2 from the environment instead of grepping
+       config.status.
+       * gettext-5: Likewise.
+       * gettext-6: Likewise.
+       * gettext-7: Likewise.
+       Reported by Ralf Wildenhues.
+
 2006-12-10  Bruno Haible  <bruno@clisp.org>
 
        Fix a test failure on Solaris.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index caa779944adaaf6125deefbcc58e48359de6f31a..595d9bc0be8d837eabc5e0cb1687fa57d40220a6 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -171,6 +171,7 @@ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
                    BUILDCSHARP='@BUILDCSHARP@' \
                    TESTCSHARP='@TESTCSHARP@' \
                    TESTLIBASPRINTF='@TESTLIBASPRINTF@' \
+                   GLIBC2='@GLIBC2@' \
                    LOCALE_FR='@LOCALE_FR@' \
                    LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
                    LOCALE_JA='@LOCALE_JA@' \

diff --git a/gettext-tools/tests/gettext-3 b/gettext-tools/tests/gettext-3
index f7f7e6292ee2060c9dfb7cd55751bf12a1dc1752..5218dc35c71e2339355fe9b429684ffccf31500b 100755 (executable)
--- a/gettext-tools/tests/gettext-3
+++ b/gettext-tools/tests/gettext-3
@@ -7,7 +7,8 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # This test works only on glibc systems.
-grep '@GLIBC2@.*yes' ../config.status >/dev/null || {
+: ${GLIBC2=no}
+test "$GLIBC2" = yes || {
   echo "Skipping test: not a glibc system"
   exit 77
 }

diff --git a/gettext-tools/tests/gettext-5 b/gettext-tools/tests/gettext-5
index 955b1a4b0931c488d56c29cf971bdf8c1063357e..19affb0a357a6db76c65ad52b97bd7bbf5ab8670 100755 (executable)
--- a/gettext-tools/tests/gettext-5
+++ b/gettext-tools/tests/gettext-5
@@ -7,7 +7,8 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # This test works only on glibc systems.
-grep '@GLIBC2@.*yes' ../config.status >/dev/null || {
+: ${GLIBC2=no}
+test "$GLIBC2" = yes || {
   echo "Skipping test: not a glibc system"
   exit 77
 }

diff --git a/gettext-tools/tests/gettext-6 b/gettext-tools/tests/gettext-6
index fd17c6e1bfe83eef48699b7f9583baccbc38d06d..79ba7e4695e42ffdbd72251b8f58945fd9e810b3 100755 (executable)
--- a/gettext-tools/tests/gettext-6
+++ b/gettext-tools/tests/gettext-6
@@ -8,7 +8,8 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # This test works only on glibc systems.
-grep '@GLIBC2@.*yes' ../config.status >/dev/null || {
+: ${GLIBC2=no}
+test "$GLIBC2" = yes || {
   echo "Skipping test: not a glibc system"
   exit 77
 }

diff --git a/gettext-tools/tests/gettext-7 b/gettext-tools/tests/gettext-7
index 3dc716c342eea6767cff7e58fe15295b973c3d1c..74db70c77978f7c6be17b17b30bd43a55484cae8 100755 (executable)
--- a/gettext-tools/tests/gettext-7
+++ b/gettext-tools/tests/gettext-7
@@ -8,7 +8,8 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # This test works only on glibc systems.
-grep '@GLIBC2@.*yes' ../config.status >/dev/null || {
+: ${GLIBC2=no}
+test "$GLIBC2" = yes || {
   echo "Skipping test: not a glibc system"
   exit 77
 }