diff options
author | Anatol Belski <ab@php.net> | 2018-03-28 18:00:28 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2018-03-28 18:01:44 +0200 |
commit | 710284cbc4a54cac0a9ec4ea29a7486e0d99a33b (patch) | |
tree | 35974499c556a3ebb7cff51253f395fb1fd97875 /acinclude.m4 | |
parent | ac4d9fd0557cefe7a833bf1b0e97078010789a95 (diff) | |
download | php-git-710284cbc4a54cac0a9ec4ea29a7486e0d99a33b.tar.gz |
Fixed bug #76153 Intl compilation fails with icu4c 61.1
Additionally, ICU >= 59.1 requires C++11, so add the flags. Some
refactoring is needed to comply with the latest recommended build
options, such as automatic icu namespace addition.
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 0e6fb5de85..3881b2da93 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2248,6 +2248,9 @@ AC_DEFUN([PHP_SETUP_ICU],[ ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio` PHP_EVAL_INCLINE($ICU_INCS) PHP_EVAL_LIBLINE($ICU_LIBS, $1) + + ICU_EXTRA_FLAGS=`$ICU_CONFIG --cxxflags` + ICU_EXTRA_FLAGS="$ICU_EXTRA_FLAGS -DU_USING_ICU_NAMESPACE=1" fi ]) |