com php-src: Use ICU's CXXFLAGS when using pkg-config: acinclude.m4

From: Date: Wed, 23 Oct 2019 09:17:37 +0000
Subject: com php-src: Use ICU's CXXFLAGS when using pkg-config: acinclude.m4
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-109022@lists.php.net to get a copy of this message
Commit: 8daf96cef35c114b9e9cbcc47fc8602be74754d3 Author: Ryan Schmidt <git@ryandesign.com> Tue, 22 Oct 2019 16:19:35 -0500 Committer: Nikita Popov <nikita.ppv@gmail.com> Wed, 23 Oct 2019 11:17:37 +0200 Parents: fa89c41f378894dc623374dd03c36a9fa16410a9 Branches: PHP-7.2 PHP-7.3 PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8daf96cef35c114b9e9cbcc47fc8602be74754d3 Log: Use ICU's CXXFLAGS when using pkg-config This mirrors how ICU's CXXFLAGS are already used when using icu-config. Changed paths: M acinclude.m4 Diff: diff --git a/acinclude.m4 b/acinclude.m4 index b69d65cbdc3..0690ec7dfe0 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])

« previous php.cvs (#109022) next »