PHP: Fix xds user agent compile flag name (#26497)

* PHP: Fix xds user agent compile flag name

* More quoting seems to be needed
pull/25960/head
Stanley Cheung 3 years ago committed by GitHub
parent f9d8524458
commit 9503f03aaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      config.m4
  2. 4
      templates/config.m4.template

@ -1039,8 +1039,8 @@ if test "$PHP_GRPC" != "no"; then
-DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN \ -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN \
-D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \ -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \
-DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 \ -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 \
-DGRPC_XDS_USER_AGENT_SUFFIX="\"PHP\"" \ -DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' \
-DGRPC_XDS_USER_AGENT_VERSION_SUFFIX="\"1.39.0dev\"") -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.39.0dev\""')
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/census) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/census)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel)

@ -61,8 +61,8 @@
-DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN ${"\\"} -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN ${"\\"}
-D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 ${"\\"} -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 ${"\\"}
-DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 ${"\\"} -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 ${"\\"}
-DGRPC_XDS_USER_AGENT_SUFFIX="\"PHP\"" ${"\\"} -DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' ${"\\"}
-DGRPC_XDS_USER_AGENT_VERSION_SUFFIX="\"${settings.php_version.php()}\"") -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"${settings.php_version.php()}\""')
<% <%
dirs = sorted(set(src[:src.rfind('/')] for src in srcs)) dirs = sorted(set(src[:src.rfind('/')] for src in srcs))
%> %>

Loading…
Cancel
Save