sniper Tue Jan 25 07:54:57 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/scripts phpize.in
Log:
MFH: - Return of the automake requirement
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.211&r2=1.1760.2.212&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.211 php-src/NEWS:1.1760.2.212
--- php-src/NEWS:1.1760.2.211 Tue Jan 25 07:28:05 2005
+++ php-src/NEWS Tue Jan 25 07:54:57 2005
@@ -5,7 +5,7 @@
- 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).
http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.15.2.2&r2=1.15.2.3&ty=u
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.15.2.2 php-src/scripts/phpize.in:1.15.2.3
--- php-src/scripts/phpize.in:1.15.2.2 Sat Jan 22 15:29:15 2005
+++ php-src/scripts/phpize.in Tue Jan 25 07:54:57 2005
@@ -90,6 +90,7 @@
(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_autotools()
{
- cat acinclude.m4 ./build/libtool.m4 > aclocal.m4 || exit 1
+ aclocal || exit 1
autoconf || exit 1
autoheader || exit 1
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
