clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

If the $PHP_AUTOCONF and $PHP_AUTOHEADER environmental variables are set

Browse Source 
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.
This commit is contained in:
Jon Parise 2006-07-17 01:17:00 +00:00
parent 758ff2f9f1
commit 3078bbabfd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/phpize.in
View File

@ -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