diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | scripts/phpize.m4 | 4 |
3 files changed, 11 insertions, 0 deletions
@@ -3,6 +3,7 @@ PHP NEWS ?? 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 diff --git a/configure.in b/configure.in index d493c8907c..706c0ed99c 100644 --- a/configure.in +++ b/configure.in @@ -1249,7 +1249,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 be7f436fd2..6e7a131c37 100644 --- 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)' |