diff options
| author | Anatol Belski <ab@php.net> | 2018-04-03 10:42:14 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-04-03 10:42:14 +0200 |
| commit | 2bd299f7318492fd7e5cafffa562d76ba60e69d4 (patch) | |
| tree | dfc69d45d6b51ad8bd6ddb8975e94ae57f050f10 | |
| parent | 9c37d95627f75dc300fd0af5df6c87d6ad92e363 (diff) | |
| download | php-git-2bd299f7318492fd7e5cafffa562d76ba60e69d4.tar.gz | |
Fix shared ext/intl compilation
| -rw-r--r-- | ext/intl/config.m4 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ext/intl/config.m4 b/ext/intl/config.m4 index aea57102f6..959ecd2b26 100644 --- a/ext/intl/config.m4 +++ b/ext/intl/config.m4 @@ -69,7 +69,7 @@ if test "$PHP_INTL" != "no"; then idn/idn.c \ $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,cxx) - PHP_ADD_SOURCES(PHP_EXT_DIR(intl), intl_convertcpp.cpp \ + PHP_INTL_CPP_SOURCES="intl_convertcpp.cpp \ common/common_enum.cpp \ common/common_date.cpp \ dateformat/dateformat_format_object.cpp \ @@ -87,8 +87,13 @@ if test "$PHP_INTL" != "no"; then breakiterator/breakiterator_methods.cpp \ breakiterator/rulebasedbreakiterator_methods.cpp \ breakiterator/codepointiterator_internal.cpp \ - breakiterator/codepointiterator_methods.cpp, \ - $ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $ICU_EXTRA_FLAGS) + breakiterator/codepointiterator_methods.cpp" + PHP_INTL_CPP_FLAGS="$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $ICU_EXTRA_FLAGS" + if test "$ext_shared" = "no"; then + PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS) + else + PHP_ADD_SOURCES_X(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS, shared_objects_intl, yes) + fi PHP_ADD_BUILD_DIR($ext_builddir/collator) PHP_ADD_BUILD_DIR($ext_builddir/converter) |