cvs: php-src /scripts phpize.in

sniper Thu Apr 7 02:25:28 2005 EDT Modified files: /php-src/scripts phpize.in Log: - Added the $PHP_AUTOCONF/$PHP_AUTOHEADER usage to phpize http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.18&r2=1.19&ty=u Index: php-src/scripts/phpize.in diff -u php-src/scripts/phpize.in:1.18 php-src/scripts/phpize.in:1.19 --- php-src/scripts/phpize.in:1.18 Tue Jan 25 07:53:43 2005 +++ php-src/scripts/phpize.in Thu Apr 7 02:25:28 2005 @@ -80,9 +80,33 @@ if test ! -x "$builddir/build/shtool"; then phpize_no_shtool exit 1 + else + php_shtool=$builddir/build/shtool fi } +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 + echo <<EOF +Cannot find autoconf. Please check your autoconf installation and the \$PHP_AUTOCONF +environment variable is set correctly and then rerun this script. + +EOF + exit 1 + fi + if ! test -x "$php_shtool path $PHP_AUTOHEADER"; then + echo <<EOF +Cannot find autoheader. Please check your autoconf installation and the \$PHP_AUTOHEADER +environment variable is set correctly and then rerun this script. + +EOF + exit 1 + fi +} phpize_copy_files() { @@ -102,9 +126,8 @@ phpize_autotools() { - aclocal || exit 1 - autoconf || exit 1 - autoheader || exit 1 + $PHP_AUTOCONF || exit 1 + $PHP_AUTOHEADER || exit 1 } # Main script @@ -141,10 +164,11 @@ touch install-sh mkinstalldirs missing - phpize_autotools - phpize_check_shtool + phpize_check_autotools + + phpize_autotools ;; esac