diff options
| author | Ryan Schmidt <git@ryandesign.com> | 2019-10-22 16:19:35 -0500 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-23 11:17:37 +0200 |
| commit | 8daf96cef35c114b9e9cbcc47fc8602be74754d3 (patch) | |
| tree | 69387a0909e17d70e34412752a9b1f53bb62b26d | |
| parent | fa89c41f378894dc623374dd03c36a9fa16410a9 (diff) | |
| download | php-git-8daf96cef35c114b9e9cbcc47fc8602be74754d3.tar.gz | |
Use ICU's CXXFLAGS when using pkg-config
This mirrors how ICU's CXXFLAGS are already used when using icu-config.
| -rw-r--r-- | acinclude.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index b69d65cbdc..0690ec7dfe 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2221,7 +2221,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]) |