diff options
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rw-r--r-- | ext/intl/config.m4 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index be0f9f23f2..c4d0f46e4f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2238,9 +2238,9 @@ AC_DEFUN([PHP_SETUP_ICU],[ PHP_EVAL_INCLINE($ICU_INCS) PHP_EVAL_LIBLINE($ICU_LIBS, $1) - ICU_EXTRA_FLAGS=`$ICU_CONFIG --cxxflags` + ICU_CXXFLAGS=`$ICU_CONFIG --cxxflags` if test "$icu_version" -ge "49000"; then - ICU_EXTRA_FLAGS="$ICU_EXTRA_FLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit" + ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit" fi fi ]) diff --git a/ext/intl/config.m4 b/ext/intl/config.m4 index 959ecd2b26..e8428e1cbb 100644 --- a/ext/intl/config.m4 +++ b/ext/intl/config.m4 @@ -88,7 +88,7 @@ if test "$PHP_INTL" != "no"; then breakiterator/rulebasedbreakiterator_methods.cpp \ breakiterator/codepointiterator_internal.cpp \ 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" + PHP_INTL_CPP_FLAGS="$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $ICU_CXXFLAGS" if test "$ext_shared" = "no"; then PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS) else |