jani Mon Aug 6 14:33:52 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src configure.in NEWS
/php-src/scripts phpize.m4
Log:
MFH:- Fixed bug #42195 (C++ compiler required always)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.68&r2=1.579.2.52.2.69&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.68
php-src/configure.in:1.579.2.52.2.69
--- php-src/configure.in:1.579.2.52.2.68 Thu Aug 2 22:28:18 2007
+++ php-src/configure.in Mon Aug 6 14:33:51 2007
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.68 2007/08/02 22:28:18 iliaa Exp $ -*-
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.69 2007/08/06 14:33:51 jani Exp $ -*-
autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1249,7 +1249,13 @@
PHP_CONFIGURE_PART(Configuring libtool)
LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS"
+
+dnl Only allow AC_PROG_CXX if it's explicitly called (by PHP_REQUIRE_CXX)
+dnl otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler
+AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC_PROG_CXX], [undefine([AC_PROG_CXX])
+AC_DEFUN([AC_PROG_CXX], [])])
AC_PROG_LIBTOOL
+
if test "$enable_debug" != "yes"; then
PHP_SET_LIBTOOL_VARIABLE([--silent])
fi
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.878&r2=1.2027.2.547.2.879&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.878 php-src/NEWS:1.2027.2.547.2.879
--- php-src/NEWS:1.2027.2.547.2.878 Sun Aug 5 14:47:42 2007
+++ php-src/NEWS Mon Aug 6 14:33:51 2007
@@ -3,6 +3,7 @@
?? Aug 2007, PHP 5.2.4
- Fixed bug #42208 (substr_replace() crashes when the same array is passed
more than once). (crrodriguez at suse dot de, Ilia)
+- Fixed bug #42195 (C++ compiler required always). (Jani)
- Fixed bug #36492 (Userfilters can leak buckets). (Sara)
02 Aug 2007, PHP 5.2.4RC1
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.3&r2=1.17.2.3.2.4&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.17.2.3.2.3
php-src/scripts/phpize.m4:1.17.2.3.2.4
--- php-src/scripts/phpize.m4:1.17.2.3.2.3 Wed Jul 25 09:41:06 2007
+++ php-src/scripts/phpize.m4 Mon Aug 6 14:33:51 2007
@@ -68,6 +68,10 @@
enable_static=no
enable_shared=yes
+dnl Only allow AC_PROG_CXX if it's explicitly called (by PHP_REQUIRE_CXX)
+dnl otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler
+AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC_PROG_CXX], [undefine([AC_PROG_CXX])
+AC_DEFUN([AC_PROG_CXX], [])])
AC_PROG_LIBTOOL
all_targets='$(PHP_MODULES)'
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
