[php-src] master: Merge branch 'PHP-8.2' into PHP-8.3
| From: | Niels Dossche | Date: | Fri, 15 Mar 2024 22:10:50 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.2' into PHP-8.3 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-127748@lists.php.net to get a copy of this message | ||
Author: Niels Dossche (nielsdos)
Date: 2024-03-15T22:56:40+01:00
Commit: https://github.com/php/php-src/commit/7d1637a48c3da971c0173687bed60af430594287
Raw diff: https://github.com/php/php-src/commit/7d1637a48c3da971c0173687bed60af430594287.diff
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
Add missing DOM dependency in config.m4 for ext/xsl
Changed paths:
M ext/xsl/config.m4
Diff:
diff --git a/ext/xsl/config.m4 b/ext/xsl/config.m4
index 14af536fa7352..8d45e8eacb9a3 100644
--- a/ext/xsl/config.m4
+++ b/ext/xsl/config.m4
@@ -29,4 +29,5 @@ if test "$PHP_XSL" != "no"; then
PHP_NEW_EXTENSION(xsl, php_xsl.c xsltprocessor.c, $ext_shared)
PHP_SUBST(XSL_SHARED_LIBADD)
PHP_ADD_EXTENSION_DEP(xsl, libxml)
+ PHP_ADD_EXTENSION_DEP(xsl, dom)
fi