jani Fri Jul 25 12:36:59 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src configure.in
/php-src/scripts phpize.m4
Log:
MFH: Fixed a minor problem in not enabling c++/g++ when not needed.
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.100&r2=1.579.2.52.2.101&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.100
php-src/configure.in:1.579.2.52.2.101
--- php-src/configure.in:1.579.2.52.2.100 Wed Jul 16 16:30:04 2008
+++ php-src/configure.in Fri Jul 25 12:36:59 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.100 2008/07/16 16:30:04 jani Exp $ -*-
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.101 2008/07/25 12:36:59 jani Exp $ -*-
autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1259,10 +1259,14 @@
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], [])])
+dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are 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], [], [
+ undefine([AC_PROG_CXX])
+ AC_DEFUN([AC_PROG_CXX], [])
+ undefine([AC_PROG_CXXCPP])
+ AC_DEFUN([AC_PROG_CXXCPP], [])
+])
AC_PROG_LIBTOOL
if test "$enable_debug" != "yes"; then
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5&r2=1.17.2.3.2.6&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5
php-src/scripts/phpize.m4:1.17.2.3.2.6
--- php-src/scripts/phpize.m4:1.17.2.3.2.5 Tue Aug 14 08:43:41 2007
+++ php-src/scripts/phpize.m4 Fri Jul 25 12:36:59 2008
@@ -70,10 +70,14 @@
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], [])])
+dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are 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], [], [
+ undefine([AC_PROG_CXX])
+ AC_DEFUN([AC_PROG_CXX], [])
+ undefine([AC_PROG_CXXCPP])
+ AC_DEFUN([AC_PROG_CXXCPP], [])
+])
AC_PROG_LIBTOOL
all_targets='$(PHP_MODULES)'
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
