MFH: - Return of the automake requirement

diff --git a/NEWS b/NEWS
index d442390079f3e2f0f3c9ee92c11c328b6c243b71..ec290879d450b33c70dcef2c18cc003ecadf26ac 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, Version 4.3.11
 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
-- 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 MacOSX shared extensions crashing on Apache startup. (Rasmus)
 - Fixed bug #31623 (OCILogin does not support password grace period).

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
 }