Fix version recognition.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index f29f8fabf6ced6493e8d7d8ad233ace7997089cc..c3f5833e6b77f1ed113e07cee09ef198804c259f 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-03  Bruno Haible  <bruno@clisp.org>
+
+       * lang-php: Fix version recognition for PHP 4.
+
 2006-06-03  Bruno Haible  <bruno@clisp.org>
 
        Explain why tests are skipped.

diff --git a/gettext-tools/tests/lang-php b/gettext-tools/tests/lang-php
index 987274cf7c8e7940b0cdbf782df8095122bbf231..a42f944b78023d989e59f0e1f3e0fd8932c0e500 100755 (executable)
--- a/gettext-tools/tests/lang-php
+++ b/gettext-tools/tests/lang-php
@@ -66,9 +66,12 @@ test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of php version 4.0 or newer.
-case `(php -v) 2>/dev/null` in
+(php -v) >/dev/null 2>/dev/null
+test $? -le 1 \
+  || { echo "Skipping test: php not found"; rm -fr $tmpfiles; exit 77; }
+case `php -v | sed -n -e 1p | sed -e 's/^[^0-9]*//'` in
   [4-9].*) ;;
-  *) echo "Skipping test: php not found or too old"; rm -fr $tmpfiles; exit 77;;
+  *) echo "Skipping test: php version too old"; rm -fr $tmpfiles; exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.