jani Mon Aug 6 14:33:06 2007 UTC
Modified files:
/php-src configure.in
/php-src/scripts phpize.m4
Log:
- Fixed bug #42195 (C++ compiler required always)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.638&r2=1.639&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.638 php-src/configure.in:1.639
--- php-src/configure.in:1.638 Thu Jul 26 22:45:22 2007
+++ php-src/configure.in Mon Aug 6 14:33:06 2007
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.638 2007/07/26 22:45:22 jani Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.639 2007/08/06 14:33:06 jani Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1156,7 +1156,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/scripts/phpize.m4?r1=1.24&r2=1.25&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.24 php-src/scripts/phpize.m4:1.25
--- php-src/scripts/phpize.m4:1.24 Wed Jul 25 09:40:58 2007
+++ php-src/scripts/phpize.m4 Mon Aug 6 14:33:06 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
