From 6238cf5a7a6bf40ff1735fc282b4d766aa2d4612 Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Tue, 27 Dec 2011 13:53:11 +0000 Subject: [PATCH] Looks like we need to explicity add libstdc++ on recent linux' too, like fedora 14 and ubuntu 11 This fixes build failures for ext/intl and several pecl exts --- NEWS | 4 ++++ acinclude.m4 | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 8c9bfbc5746..7d57c3b66d5 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,10 @@ PHP NEWS - CLI SAPI: . Fixed bug #60591 (Memory leak when access a non-exists file). (Laruence) +- Intl: + . Fixed build on Fedora 15 / Ubuntu 11. (Hannes) + + 22 Dec 2011, PHP 5.4.0 RC4 - Core: . Added max_input_vars directive to prevent attacks based on hash collisions diff --git a/acinclude.m4 b/acinclude.m4 index 528278c1cb7..e1842bb5aa9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -762,11 +762,7 @@ AC_DEFUN([PHP_REQUIRE_CXX],[ if test -z "$php_cxx_done"; then AC_PROG_CXX AC_PROG_CXXCPP - case $host_alias in - *darwin*) - PHP_ADD_LIBRARY(stdc++) - ;; - esac + PHP_ADD_LIBRARY(stdc++) php_cxx_done=yes fi ])