jon Mon Jul 17 01:17:00 2006 UTC
Modified files:
/php-src/scripts phpize.in
Log:
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.
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.in?r1=1.31&r2=1.32&diff_format=u
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.31 php-src/scripts/phpize.in:1.32
--- php-src/scripts/phpize.in:1.31 Mon Jul 17 00:46:00 2006
+++ php-src/scripts/phpize.in Mon Jul 17 01:17:00 2006
@@ -102,19 +102,18 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
