- Fixed a minor problem in not enabling c++/g++ when not needed.

diff --git a/configure.in b/configure.in
index d2fa9df5bf3f5575b9c259d670f298e5cb4408c8..1e2df7874901691a3720696587b93a2c47c80dca 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1254,10 +1254,14 @@ 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], [])])
+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

diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index 9b7d9e598be46a3391cb7389c939bb79291651ef..6c10f53b49e5cb70587fa77c0e54c02b0ba0069c 100644 (file)
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -70,10 +70,14 @@ sinclude(config.m4)
 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)'