php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Autotools: Fix PHP_EMBED_TYPE variable substitution (#15414)

Browse Source 
This is a follow-up of f6dcca00bc as
Autoconf always seems to do a variable substitution, even when called
conditionally. When passing argument other than shared or static to
--enable-embed=ARGUMENT this now puts an empty string inside generated
php-config script.
This commit is contained in:
Peter Kokot
2024-08-15 11:42:47 +02:00
committed by GitHub
parent 4f4794b12d
commit 794ba29a57
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sapi/embed/config.m4
View File

@@ -19,9 +19,10 @@ if test "$PHP_EMBED" != "no"; then
PHP_EMBED_TYPE=static
INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(orig_libdir); \$(INSTALL) -m 0644 $SAPI_STATIC \$(INSTALL_ROOT)\$(orig_libdir)"
],
[PHP_EMBED_TYPE=no])
[PHP_EMBED_TYPE=])
AS_VAR_IF([PHP_EMBED_TYPE], [no],, [
AS_VAR_IF([PHP_EMBED_TYPE],, [AC_MSG_RESULT([no])], [
AC_MSG_RESULT([$PHP_EMBED_TYPE])
PHP_SUBST([LIBPHP_CFLAGS])
AC_SUBST([PHP_EMBED_TYPE])
PHP_SELECT_SAPI([embed],
@@ -30,7 +31,6 @@ if test "$PHP_EMBED" != "no"; then
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
PHP_INSTALL_HEADERS([sapi/embed], [php_embed.h])
])
AC_MSG_RESULT([$PHP_EMBED_TYPE])
else
AC_MSG_RESULT([no])
fi