mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-26 19:33:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync exif dependency on mbstring extension as optional (#16062)

Browse Source 
When decoding multibyte data in EXIF tags, the mbstring extension needs
to be enabled. In Autotools this is now synced with ZEND_MOD_OPTIONAL
in the C code, and on Windows it is now also optional.

The required dependency on mbstring extension was removed via
755c2cd0d8 which made the mbstring
extension optional dependency.
This commit is contained in:
Peter Kokot 2024-09-26 09:53:58 +02:00 committed by GitHub
parent d62b9eb9c4
commit 9ee9c0e674
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/exif/config.m4
View File

@ -10,4 +10,5 @@ if test "$PHP_EXIF" != "no"; then
[exif.c],
[$ext_shared],,
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
PHP_ADD_EXTENSION_DEP(exif, mbstring, true)
fi

12
ext/exif/config.w32
View File

@ -2,12 +2,8 @@
ARG_ENABLE('exif', 'Exchangeable image information (EXIF) Support', 'no');
if(PHP_EXIF != 'no')
{
if(ADD_EXTENSION_DEP('exif', 'mbstring'))
{
AC_DEFINE('HAVE_EXIF', 1, "Define to 1 if the PHP extension 'exif' is available.");
EXTENSION('exif', 'exif.c', null, '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
}
if(PHP_EXIF != 'no') {
AC_DEFINE('HAVE_EXIF', 1, "Define to 1 if the PHP extension 'exif' is available.");
EXTENSION('exif', 'exif.c', null, '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
ADD_EXTENSION_DEP('exif', 'mbstring', true);
}