- Added path sanity check (autotools + libtool do not cope with whitespace..)

This commit is contained in:
Jani Taskinen 2009-04-20 15:02:49 +00:00
parent cdc6dcfc3c
commit eae5e43243

View file

@ -80,6 +80,24 @@ Cannot find build files at '$phpdir'. Please check your PHP installation.
EOF EOF
exit 1 exit 1
fi 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() phpize_check_shtool()
@ -103,7 +121,7 @@ phpize_check_autotools()
test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
if ! test -x $PHP_AUTOCONF && ! test -x "`$php_shtool path $PHP_AUTOCONF`"; then if ! test -x "$PHP_AUTOCONF" && ! test -x "`$php_shtool path $PHP_AUTOCONF`"; then
cat <<EOF cat <<EOF
Cannot find autoconf. Please check your autoconf installation and the Cannot find autoconf. Please check your autoconf installation and the
\$PHP_AUTOCONF environment variable. Then, rerun this script. \$PHP_AUTOCONF environment variable. Then, rerun this script.
@ -111,7 +129,7 @@ Cannot find autoconf. Please check your autoconf installation and the
EOF EOF
exit 1 exit 1
fi fi
if ! test -x $PHP_AUTOHEADER && ! test -x "`$php_shtool path $PHP_AUTOHEADER`"; then if ! test -x "$PHP_AUTOHEADER" && ! test -x "`$php_shtool path $PHP_AUTOHEADER`"; then
cat <<EOF cat <<EOF
Cannot find autoheader. Please check your autoconf installation and the Cannot find autoheader. Please check your autoconf installation and the
\$PHP_AUTOHEADER environment variable. Then, rerun this script. \$PHP_AUTOHEADER environment variable. Then, rerun this script.