cvs: php-src(PHP_4_3) /scripts phpize.in

sniper Thu Apr 7 18:04:26 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/scripts phpize.in Log: MFH http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.1.2.14&r2=1.1.2.15&ty=u Index: php-src/scripts/phpize.in diff -u php-src/scripts/phpize.in:1.1.2.14 php-src/scripts/phpize.in:1.1.2.15 --- php-src/scripts/phpize.in:1.1.2.14 Thu Apr 7 16:49:01 2005 +++ php-src/scripts/phpize.in Thu Apr 7 18:04:26 2005 @@ -66,7 +66,7 @@ phpize_no_shtool() { - echo <<EOF + cat <<EOF shtool at '$builddir/build/shtool' not executable. Make sure that the file exists and is executable and then rerun this script. @@ -90,16 +90,16 @@ 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 + if ! 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. EOF exit 1 fi - if ! test -x "$php_shtool path $PHP_AUTOHEADER"; then - echo <<EOF + if ! 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. @@ -114,7 +114,7 @@ (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build) (cd "$phpdir" && cp $FILES "$builddir") - (cd "$builddir" && cat ./build/libtool.m4 >> acinclude.m4) + (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4) } phpize_replace_prefix()