MFH: - Return of the automake requirement

diff --git a/NEWS b/NEWS
index 5283dc78d3c17c147fb6d1dab8cf71160d1595b6..ffe49b251042bfdfc2dc473c62406557aebee0a7 100644 (file)
--- 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 6d09cf98d0f68668da316882ae39fb67a81966be..1901323471d6da3da51418327b29e7dea6ab66b5 100644 (file)
--- 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
 }