jani Mon Apr 20 15:03:57 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/scripts phpize.in
Log:
MFH:- Added path sanity check (autotools + libtool do not cope with
whitespace..)
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.in?r1=1.28.2.3.2.1&r2=1.28.2.3.2.2&diff_format=u
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.28.2.3.2.1
php-src/scripts/phpize.in:1.28.2.3.2.2
--- php-src/scripts/phpize.in:1.28.2.3.2.1 Fri Jun 29 01:10:35 2007
+++ php-src/scripts/phpize.in Mon Apr 20 15:03:57 2009
@@ -80,6 +80,24 @@
EOF
exit 1
fi
+
+ case "$phpdir" in
+ *\ * | *\ *)
+ cat <<EOF
+Invalid source path '$phpdir'. Whitespace is not allowed in source path.
+
+EOF
+ exit 1;;
+ esac
+
+ case "$builddir" in
+ *\ * | *\ *)
+ cat <<EOF
+Invalid build path '$builddir'. Whitespace is not allowed in build path.
+
+EOF
+ exit 1;;
+ esac
}
phpize_check_shtool()
@@ -103,18 +121,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 ! test -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.
+Cannot find autoconf. Please check your autoconf installation and the
+\$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.
+Cannot find autoheader. Please check your autoconf installation and the
+\$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
