cvs: php-src(PHP_4_3) /build build2.mk buildcheck.sh /scripts phpize.in

sniper Thu Apr 7 16:49:02 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/build build2.mk buildcheck.sh /php-src/scripts phpize.in Log: MFH http://cvs.php.net/diff.php/php-src/build/build2.mk?r1=1.27.4.8&r2=1.27.4.9&ty=u Index: php-src/build/build2.mk diff -u php-src/build/build2.mk:1.27.4.8 php-src/build/build2.mk:1.27.4.9 --- php-src/build/build2.mk:1.27.4.8 Thu Feb 3 12:43:04 2005 +++ php-src/build/build2.mk Thu Apr 7 16:49:00 2005 @@ -14,7 +14,7 @@ # | Author: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: build2.mk,v 1.27.4.8 2005/02/03 17:43:04 sniper Exp $ +# $Id: build2.mk,v 1.27.4.9 2005/04/07 20:49:00 sniper Exp $ # include generated_lists @@ -32,6 +32,9 @@ targets = $(TOUCH_FILES) configure $(config_h_in) +PHP_AUTOCONF ?= 'autoconf' +PHP_AUTOHEADER ?= 'autoheader' + SUPPRESS_WARNINGS ?= 2>&1 | (egrep -v '(AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_DECL_YYTEXT is expanded from...|the top level)'||true) all: $(targets) @@ -45,7 +48,7 @@ # correctly otherwise (timestamps are not updated) @echo rebuilding $@ @rm -f $@ - autoheader $(SUPPRESS_WARNINGS) + $(PHP_AUTOHEADER) $(SUPPRESS_WARNINGS) $(TOUCH_FILES): touch $(TOUCH_FILES) @@ -56,5 +59,5 @@ configure: aclocal.m4 configure.in $(config_m4_files) @echo rebuilding $@ - autoconf $(SUPPRESS_WARNINGS) + $(PHP_AUTOCONF) $(SUPPRESS_WARNINGS) http://cvs.php.net/diff.php/php-src/build/buildcheck.sh?r1=1.21.2.11&r2=1.21.2.12&ty=u Index: php-src/build/buildcheck.sh diff -u php-src/build/buildcheck.sh:1.21.2.11 php-src/build/buildcheck.sh:1.21.2.12 --- php-src/build/buildcheck.sh:1.21.2.11 Wed Jan 19 20:43:18 2005 +++ php-src/build/buildcheck.sh Thu Apr 7 16:49:00 2005 @@ -16,15 +16,20 @@ # | Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: buildcheck.sh,v 1.21.2.11 2005/01/20 01:43:18 sniper Exp $ +# $Id: buildcheck.sh,v 1.21.2.12 2005/04/07 20:49:00 sniper Exp $ # echo "buildconf: checking installation..." stamp=$1 +# Allow the autoconf executable to be overriden by $PHP_AUTOCONF. +if test -z "$PHP_AUTOCONF"; then + PHP_AUTOCONF='autoconf' +fi + # autoconf 2.13 or newer -ac_version=autoconf --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//' +ac_version=$PHP_AUTOCONF --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//' if test -z "$ac_version"; then echo "buildconf: autoconf not found." echo " You need autoconf version 2.13 or newer installed" @@ -42,7 +47,9 @@ fi if test "$1" = "2" && test "$2" -ge "50"; then - echo "buildconf: running cvsclean." + echo "buildconf: Your version of autoconf likely contains buggy cache code." + echo " Running cvsclean for you." + echo " To avoid this, install autoconf-2.13 and automake-1.5." ./cvsclean stamp= fi http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.1.2.13&r2=1.1.2.14&ty=u Index: php-src/scripts/phpize.in diff -u php-src/scripts/phpize.in:1.1.2.13 php-src/scripts/phpize.in:1.1.2.14 --- php-src/scripts/phpize.in:1.1.2.13 Tue Jan 25 07:55:55 2005 +++ php-src/scripts/phpize.in Thu Apr 7 16:49:01 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