Use ICU's CXXFLAGS when using pkg-config

This mirrors how ICU's CXXFLAGS are already used when using icu-config.
php · Oct 23, 2019 · 8daf96c · 8daf96c
1 parent fa89c41
commit 8daf96c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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])