- Fixed bug #42195 (C++ compiler required always)

diff --git a/configure.in b/configure.in
index 02c6f28c9cffeb5c22090fc433d6cbf3f8657b40..64abaac54ed994e423024aa29c6f400854ab6fce 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1156,7 +1156,13 @@ PHP_HELP_SEPARATOR([Libtool:])
 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

diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index 28f6913b844d80ee833def0f6381b9d5a9e6cd6a..a46dc8bc856de30c52ea4e79a336d1063561b086 100644 (file)
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -68,6 +68,10 @@ 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], [])])
 AC_PROG_LIBTOOL
 
 all_targets='$(PHP_MODULES)'