diff -Naur php-5.1.2/build/build2.mk php-5.1.2.oden/build/build2.mk --- php-5.1.2/build/build2.mk 2006-01-01 13:50:00.000000000 +0100 +++ php-5.1.2.oden/build/build2.mk 2006-01-15 10:20:50.000000000 +0100 @@ -31,6 +31,7 @@ PHP_AUTOCONF ?= 'autoconf' PHP_AUTOHEADER ?= 'autoheader' +PHP_ACLOCAL ?= 'aclocal-1.7' 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) diff -Naur php-5.1.2/scripts/phpize.in php-5.1.2.oden/scripts/phpize.in --- php-5.1.2/scripts/phpize.in 2005-12-12 12:51:45.000000000 +0100 +++ php-5.1.2.oden/scripts/phpize.in 2006-01-15 10:22:18.000000000 +0100 @@ -7,9 +7,11 @@ includedir="`eval echo @includedir@`/php" builddir="`pwd`" +export WANT_AUTOCONF_2_5="1" + FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4" FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php" -CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \ +CLEAN_FILES="$FILES *.so *.o *.lo* *.la .deps .libs/ build/ include/ modules/ install-sh \ mkinstalldirs missing config.nice config.sub config.guess configure configure.in \ aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \ config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h \ @@ -101,6 +103,7 @@ { test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader + test -z "$PHP_ACLOCAL" && PHP_ACLOCAL=aclocal-1.7 if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then cat <<EOF @@ -118,6 +121,14 @@ EOF exit 1 fi + if ! test -x "`$php_shtool path $PHP_ACLOCAL`"; then + cat <<EOF +Cannot find aclocal. Please check your autoconf installation and the \$PHP_ACLOCAL +environment variable is set correctly and then rerun this script. + +EOF + exit 1 + fi } phpize_copy_files() @@ -131,13 +142,13 @@ phpize_replace_prefix() { - sed \ - -e "s#@prefix@#$prefix#" \ - < "$phpdir/phpize.m4" > configure.in + cp $phpdir/phpize.m4 configure.in } phpize_autotools() { + libtoolize --copy --force || exit 1 + $PHP_ACLOCAL || exit 1 $PHP_AUTOCONF || exit 1 $PHP_AUTOHEADER || exit 1 }