From da481f318918d69a4d400fd3519558ad6243ceb9 Mon Sep 17 00:00:00 2001 From: foobar Date: Tue, 25 Jan 2005 12:54:57 +0000 Subject: [PATCH] MFH: - Return of the automake requirement --- NEWS | 2 +- scripts/phpize.in | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 5283dc78d3..ffe49b2510 100644 --- a/NEWS +++ b/NEWS @@ -5,7 +5,7 @@ PHP NEWS - Added length and charsetnr for field array and object in mysqli. (Georg) - Changed foreach() to throw an exception if IteratorAggregate::getIterator() does not return an Iterator. (Marcus) -- Changed phpize not to require automake and libtool. (Jani) +- Changed phpize not to require libtool. (Jani) - Fixed build system to always use bundled libtool files. (Jani) - Fixed a bug in mysqli_stmt_execute() (type conversion with NULL values). (Georg) - Fixed bug #31651 (ReflectionClass::getDefaultProperties segfaults with arrays). diff --git a/scripts/phpize.in b/scripts/phpize.in index 6d09cf98d0..1901323471 100644 --- a/scripts/phpize.in +++ b/scripts/phpize.in @@ -90,6 +90,7 @@ phpize_copy_files() (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build) (cd "$phpdir" && cp $FILES "$builddir") + (cd "$builddir" && cat ./build/libtool.m4 >> acinclude.m4) } phpize_replace_prefix() @@ -101,7 +102,7 @@ phpize_replace_prefix() phpize_autotools() { - cat acinclude.m4 ./build/libtool.m4 > aclocal.m4 || exit 1 + aclocal || exit 1 autoconf || exit 1 autoheader || exit 1 } -- 2.50.1