summaryrefslogtreecommitdiff
path: root/ext/intl/config.m4
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-03-28 18:00:28 +0200
committerAnatol Belski <ab@php.net>2018-03-28 18:01:44 +0200
commit710284cbc4a54cac0a9ec4ea29a7486e0d99a33b (patch)
tree35974499c556a3ebb7cff51253f395fb1fd97875 /ext/intl/config.m4
parentac4d9fd0557cefe7a833bf1b0e97078010789a95 (diff)
downloadphp-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 'ext/intl/config.m4')
-rw-r--r--ext/intl/config.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
index ca2cd822f4..a496d8d70c 100644
--- a/ext/intl/config.m4
+++ b/ext/intl/config.m4
@@ -86,7 +86,7 @@ if test "$PHP_INTL" != "no"; then
breakiterator/codepointiterator_methods.cpp \
uchar/uchar.c \
idn/idn.c \
- $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,cxx)
+ $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $ICU_EXTRA_FLAGS,cxx)
PHP_ADD_BUILD_DIR($ext_builddir/collator)
PHP_ADD_BUILD_DIR($ext_builddir/converter)
PHP_ADD_BUILD_DIR($ext_builddir/common)