If the $PHP_AUTOCONF and $PHP_AUTOHEADER environmental variables are set

to full paths, the `shtool path` test would fail (because it only tests
for the existence of a bare filename in the current $PATH).  We now test
the the executability of $PHP_AUTOCONF and $PHP_AUTOHEADER before falling
back to the `shtool path` test.

Later on, phpize will execute $PHP_AUTOCONF and $PHP_AUTOHEADER directly,
so they will work fine as either absolute paths or files within $PATH.

Also, improving the grammar of the error messages in the failure cases.

diff --git a/scripts/phpize.in b/scripts/phpize.in
index c62a32af2e51c01d11ac6bd87f398ba3a83fb97f..1394c6547624c36e6f0205e7c25bf3100d854f2c 100644 (file)
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@ -102,19 +102,18 @@ phpize_check_autotools()
   test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
   test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
   
-  if ! test -x "`$php_shtool path $PHP_AUTOCONF`"; then
+  if ! text -x $PHP_AUTOCONF && ! test -x "`$php_shtool path $PHP_AUTOCONF`"; then
     cat <<EOF
 Cannot find autoconf. Please check your autoconf installation and the
-\$PHP_AUTOCONF environment variable is set correctly and then rerun this script.
+\$PHP_AUTOCONF environment variable. Then, rerun this script.
 
 EOF
     exit 1
   fi
-  if ! test -x "`$php_shtool path $PHP_AUTOHEADER`"; then
+  if ! test -x $PHP_AUTOHEADER && ! test -x "`$php_shtool path $PHP_AUTOHEADER`"; then
     cat <<EOF
 Cannot find autoheader. Please check your autoconf installation and the
-\$PHP_AUTOHEADER environment variable is set correctly and then rerun this
-script.
+\$PHP_AUTOHEADER environment variable. Then, rerun this script.
 
 EOF
     exit 1