diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-23 11:17:46 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-23 11:17:46 +0200 |
| commit | 813305b67f3022da3efb071114b7cc1e47ace005 (patch) | |
| tree | fb8346649523007b96129e56a94096844c22ba54 | |
| parent | 832b5c7b9d8d2318bd0c02015c41deb5ddb0792c (diff) | |
| parent | 8daf96cef35c114b9e9cbcc47fc8602be74754d3 (diff) | |
| download | php-git-813305b67f3022da3efb071114b7cc1e47ace005.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Use ICU's CXXFLAGS when using pkg-config
| -rw-r--r-- | acinclude.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 4269b9b5d9..bf4c88d3a3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2193,7 +2193,8 @@ AC_DEFUN([PHP_SETUP_ICU],[ ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io icu-i18n` ICU_INCS=`$PKG_CONFIG --cflags-only-I icu-uc icu-io icu-i18n` - ICU_CXXFLAGS="-DU_USING_ICU_NAMESPACE=1" + ICU_CXXFLAGS=`$PKG_CONFIG --variable=CXXFLAGS icu-uc` + ICU_CXXFLAGS="$ICU_CXXFLAGS -DU_USING_ICU_NAMESPACE=1" AC_MSG_RESULT([found $ICU_VERSION]) |