summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Magnusson <bjori@php.net>2011-12-27 13:53:11 +0000
committerHannes Magnusson <bjori@php.net>2011-12-27 13:53:11 +0000
commit6238cf5a7a6bf40ff1735fc282b4d766aa2d4612 (patch)
tree742bd61aa583e408bafbc62a0d15fff99eedf1e6
parentddf95da798ebd6d90542eb10e563333b91e47e65 (diff)
downloadphp-git-6238cf5a7a6bf40ff1735fc282b4d766aa2d4612.tar.gz
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
-rw-r--r--NEWS4
-rw-r--r--acinclude.m46
2 files changed, 5 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 8c9bfbc574..7d57c3b66d 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 528278c1cb..e1842bb5aa 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
])