diff options
| author | Anatol Belski <ab@php.net> | 2018-04-05 14:54:14 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-04-05 14:54:14 +0200 |
| commit | 7768f5e2decfed03515f4bc7cdb3536a3c575a52 (patch) | |
| tree | 5dab951609d9a656a4418d6f86fd651c4f41b1e5 | |
| parent | 1e1695e8de397ddf7d473a4492fd5b0ad64fa5b4 (diff) | |
| parent | ed5aabe8b78d8487ffc6091e0670753d59bb7f5a (diff) | |
| download | php-git-7768f5e2decfed03515f4bc7cdb3536a3c575a52.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Rename var
| -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 ce9b43522e..1a692b72f4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2238,8 +2238,8 @@ AC_DEFUN([PHP_SETUP_ICU],[ 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" + ICU_CXXFLAGS=`$ICU_CONFIG --cxxflags` + ICU_CXXFLAGS="$ICU_CXXFLAGS -DU_USING_ICU_NAMESPACE=1" 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 |