From: Bruno Haible <bruno@clisp.org>
Date: Sat, 16 Dec 2006 16:58:17 +0000 (+0000)
Subject: Don't grep config.status.
X-Git-Tag: v0.17~580
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72ec25dcf2c2174d070f3fec91df40cb10d7a8b4;p=thirdparty%2Fgettext.git

Don't grep config.status.
---

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 51ac85103..f8ba4ee1c 100644
--- 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 caa779944..595d9bc0b 100644
--- 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 f7f7e6292..5218dc35c 100755
--- 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 955b1a4b0..19affb0a3 100755
--- 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 fd17c6e1b..79ba7e469 100755
--- 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 3dc716c34..74db70c77 100755
--- 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
 }