archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update gd extension preprocessor macros help texts (#15296)

Browse source 
PHP_GD_CHECK_FORMAT macro 2nd argument is changed from automatic
AC_DEFINE_UNQUOTED to manual action for easier usage.
This commit is contained in:
Peter Kokot 2024-08-09 18:06:02 +02:00 • committed by GitHub
parent 1e3d918936
commit 72fb00b644
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 65 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

88
ext/gd/config.m4
View file

@ -70,7 +70,7 @@ AC_DEFUN([PHP_GD_PNG],[
PKG_CHECK_MODULES([PNG], [libpng]) PKG_CHECK_MODULES([PNG], [libpng])
PHP_EVAL_LIBLINE([$PNG_LIBS], [GD_SHARED_LIBADD]) PHP_EVAL_LIBLINE([$PNG_LIBS], [GD_SHARED_LIBADD])
PHP_EVAL_INCLINE([$PNG_CFLAGS]) PHP_EVAL_INCLINE([$PNG_CFLAGS])
AC_DEFINE(HAVE_LIBPNG, 1, [ ]) AC_DEFINE([HAVE_LIBPNG], [1], [Define to 1 if you have the libpng library.])
]) ])
AC_DEFUN([PHP_GD_AVIF],[ AC_DEFUN([PHP_GD_AVIF],[
@ -78,8 +78,10 @@ AC_DEFUN([PHP_GD_AVIF],[
PKG_CHECK_MODULES([AVIF], [libavif >= 0.8.2]) PKG_CHECK_MODULES([AVIF], [libavif >= 0.8.2])
PHP_EVAL_LIBLINE([$AVIF_LIBS], [GD_SHARED_LIBADD]) PHP_EVAL_LIBLINE([$AVIF_LIBS], [GD_SHARED_LIBADD])
PHP_EVAL_INCLINE([$AVIF_CFLAGS]) PHP_EVAL_INCLINE([$AVIF_CFLAGS])
AC_DEFINE(HAVE_LIBAVIF, 1, [ ]) AC_DEFINE([HAVE_LIBAVIF], [1],
AC_DEFINE(HAVE_GD_AVIF, 1, [ ]) [Define to 1 if you have the libavif library.])
AC_DEFINE([HAVE_GD_AVIF], [1],
[Define to 1 if gd extension has AVIF support.])
fi fi
]) ])
@ -88,8 +90,10 @@ AC_DEFUN([PHP_GD_WEBP],[
PKG_CHECK_MODULES([WEBP], [libwebp >= 0.2.0]) PKG_CHECK_MODULES([WEBP], [libwebp >= 0.2.0])
PHP_EVAL_LIBLINE([$WEBP_LIBS], [GD_SHARED_LIBADD]) PHP_EVAL_LIBLINE([$WEBP_LIBS], [GD_SHARED_LIBADD])
PHP_EVAL_INCLINE([$WEBP_CFLAGS]) PHP_EVAL_INCLINE([$WEBP_CFLAGS])
AC_DEFINE(HAVE_LIBWEBP, 1, [ ]) AC_DEFINE([HAVE_LIBWEBP], [1],
AC_DEFINE(HAVE_GD_WEBP, 1, [ ]) [Define to 1 if you have the libwebp library.])
AC_DEFINE([HAVE_GD_WEBP], [1],
[Define to 1 if gd extension has WebP support.])
fi fi
]) ])
@ -98,8 +102,10 @@ AC_DEFUN([PHP_GD_JPEG],[
PKG_CHECK_MODULES([JPEG], [libjpeg]) PKG_CHECK_MODULES([JPEG], [libjpeg])
PHP_EVAL_LIBLINE([$JPEG_LIBS], [GD_SHARED_LIBADD]) PHP_EVAL_LIBLINE([$JPEG_LIBS], [GD_SHARED_LIBADD])
PHP_EVAL_INCLINE([$JPEG_CFLAGS]) PHP_EVAL_INCLINE([$JPEG_CFLAGS])
AC_DEFINE(HAVE_LIBJPEG, 1, [ ]) AC_DEFINE([HAVE_LIBJPEG], [1],
AC_DEFINE(HAVE_GD_JPG, 1, [ ]) [Define to 1 if you have the libjpeg library.])
AC_DEFINE([HAVE_GD_JPG], [1],
[Define to 1 if gd extension has JPEG support.])
fi fi
]) ])
@ -108,8 +114,9 @@ AC_DEFUN([PHP_GD_XPM],[
PKG_CHECK_MODULES([XPM], [xpm]) PKG_CHECK_MODULES([XPM], [xpm])
PHP_EVAL_LIBLINE([$XPM_LIBS], [GD_SHARED_LIBADD]) PHP_EVAL_LIBLINE([$XPM_LIBS], [GD_SHARED_LIBADD])
PHP_EVAL_INCLINE([$XPM_CFLAGS]) PHP_EVAL_INCLINE([$XPM_CFLAGS])
AC_DEFINE(HAVE_XPM, 1, [ ]) AC_DEFINE([HAVE_XPM], [1], [Define to 1 if you have the xpm library.])
AC_DEFINE(HAVE_GD_XPM, 1, [ ]) AC_DEFINE([HAVE_GD_XPM], [1],
[Define to 1 if gd extension has XPM support.])
fi fi
]) ])
@ -119,27 +126,34 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
PHP_EVAL_INCLINE([$FREETYPE2_CFLAGS]) PHP_EVAL_INCLINE([$FREETYPE2_CFLAGS])
PHP_EVAL_LIBLINE([$FREETYPE2_LIBS], [GD_SHARED_LIBADD]) PHP_EVAL_LIBLINE([$FREETYPE2_LIBS], [GD_SHARED_LIBADD])
AC_DEFINE(HAVE_LIBFREETYPE, 1, [ ]) AC_DEFINE([HAVE_LIBFREETYPE], [1],
AC_DEFINE(HAVE_GD_FREETYPE, 1, [ ]) [Define to 1 if you have the FreeType library.])
AC_DEFINE([HAVE_GD_FREETYPE], [1],
[Define to 1 if gd extension has FreeType support.])
fi fi
]) ])
AC_DEFUN([PHP_GD_JISX0208],[ AC_DEFUN([PHP_GD_JISX0208],[
if test "$PHP_GD_JIS_CONV" = "yes"; then if test "$PHP_GD_JIS_CONV" = "yes"; then
AC_DEFINE(USE_GD_JISX0208, 1, [ ]) AC_DEFINE([USE_GD_JISX0208], [1],
AC_DEFINE(JISX0208, 1, [ ]) [Define to 1 if gd extension has JIS-mapped Japanese font support.])
AC_DEFINE([JISX0208], [1],
[Define to 1 if GD library has JIS-mapped Japanese font support.])
fi fi
]) ])
dnl
dnl PHP_GD_CHECK_FORMAT(format, [action-if-found])
dnl
dnl Build and run a program to determine if GD has support for the given dnl Build and run a program to determine if GD has support for the given
dnl format. The first argument is the proper-noun-capitalized name of the dnl format. The first argument is the proper-noun-capitalized name of the
dnl format -- basically the word Foo in gdImageCreateFromFoo -- such as dnl format -- basically the word Foo in gdImageCreateFromFoo -- such as
dnl Png. If support for format Foo exists, the second argument (the name dnl Png. If support for "format" Foo exists, the "action-if-found" is executed.
dnl of a constant) will be defined to 1. The reason for this charade is dnl The reason for this charade is that gd defines no-op versions of each
dnl that gd defines "junk" versions of each gdImageCreateFromFoo function dnl gdImageCreateFromFoo function even when it does not support the Foo format.
dnl even when it does not support the Foo format. Those junk functions dnl Those no-op functions display a warning but eventually return normally,
dnl display a warning but eventually return normally, making a simple link dnl making a simple link or run test insufficient.
dnl or run test insufficient. dnl
AC_DEFUN([PHP_GD_CHECK_FORMAT], AC_DEFUN([PHP_GD_CHECK_FORMAT],
[AS_VAR_PUSHDEF([php_var], [php_cv_lib_gd_gdImageCreateFrom$1]) [AS_VAR_PUSHDEF([php_var], [php_cv_lib_gd_gdImageCreateFrom$1])
old_LIBS="${LIBS}" old_LIBS="${LIBS}"
@ -171,9 +185,7 @@ int main(int argc, char** argv) {
[AS_VAR_SET([php_var], [yes])], [AS_VAR_SET([php_var], [yes])],
[AS_VAR_SET([php_var], [no])], [AS_VAR_SET([php_var], [no])],
[AS_VAR_SET([php_var], [no])])]) [AS_VAR_SET([php_var], [no])])])
AS_VAR_IF([php_var], [yes], AS_VAR_IF([php_var], [yes], [$2])
[AC_DEFINE_UNQUOTED([$2], [1],
[Define to 1 if GD library has 'gdImageCreateFrom$1'.])])
AC_LANG_POP([C]) AC_LANG_POP([C])
CFLAGS="${old_CFLAGS}" CFLAGS="${old_CFLAGS}"
LIBS="${old_LIBS}" LIBS="${old_LIBS}"
@ -181,23 +193,26 @@ AS_VAR_POPDEF([php_var])
]) ])
AC_DEFUN([PHP_GD_CHECK_VERSION],[ AC_DEFUN([PHP_GD_CHECK_VERSION],[
PHP_GD_CHECK_FORMAT([Png], [HAVE_GD_PNG]) PHP_GD_CHECK_FORMAT([Png], [AC_DEFINE([HAVE_GD_PNG], [1])])
PHP_GD_CHECK_FORMAT([Avif], [HAVE_GD_AVIF]) PHP_GD_CHECK_FORMAT([Avif], [AC_DEFINE([HAVE_GD_AVIF], [1])])
PHP_GD_CHECK_FORMAT([Webp], [HAVE_GD_WEBP]) PHP_GD_CHECK_FORMAT([Webp], [AC_DEFINE([HAVE_GD_WEBP], [1])])
PHP_GD_CHECK_FORMAT([Jpeg], [HAVE_GD_JPG]) PHP_GD_CHECK_FORMAT([Jpeg], [AC_DEFINE([HAVE_GD_JPG], [1])])
PHP_GD_CHECK_FORMAT([Xpm], [HAVE_GD_XPM]) PHP_GD_CHECK_FORMAT([Xpm], [AC_DEFINE([HAVE_GD_XPM], [1])])
PHP_GD_CHECK_FORMAT([Bmp], [HAVE_GD_BMP]) PHP_GD_CHECK_FORMAT([Bmp], [AC_DEFINE([HAVE_GD_BMP], [1])])
PHP_GD_CHECK_FORMAT([Tga], [HAVE_GD_TGA]) PHP_GD_CHECK_FORMAT([Tga], [AC_DEFINE([HAVE_GD_TGA], [1])])
PHP_CHECK_LIBRARY([gd], [gdFontCacheShutdown], PHP_CHECK_LIBRARY([gd], [gdFontCacheShutdown],
[AC_DEFINE([HAVE_GD_FREETYPE], [1], [ ])], [AC_DEFINE([HAVE_GD_FREETYPE], [1])],
[], [],
[$GD_SHARED_LIBADD]) [$GD_SHARED_LIBADD])
PHP_CHECK_LIBRARY([gd], [gdVersionString], PHP_CHECK_LIBRARY([gd], [gdVersionString],
[AC_DEFINE([HAVE_GD_LIBVERSION], [1], [ ])], [AC_DEFINE([HAVE_GD_LIBVERSION], [1],
[Define to 1 if GD library has the 'gdVersionString' function.])],
[], [],
[$GD_SHARED_LIBADD]) [$GD_SHARED_LIBADD])
PHP_CHECK_LIBRARY([gd], [gdImageGetInterpolationMethod], PHP_CHECK_LIBRARY([gd], [gdImageGetInterpolationMethod],
[AC_DEFINE([HAVE_GD_GET_INTERPOLATION], [1], [ ])], [AC_DEFINE([HAVE_GD_GET_INTERPOLATION], [1],
[Define to 1 if GD library has the 'gdImageGetInterpolationMethod'
function.])],
[], [],
[$GD_SHARED_LIBADD]) [$GD_SHARED_LIBADD])
]) ])
@ -255,9 +270,12 @@ if test "$PHP_GD" != "no"; then
dnl These are always available with bundled library dnl These are always available with bundled library
AC_DEFINE([HAVE_GD_BUNDLED], [1], AC_DEFINE([HAVE_GD_BUNDLED], [1],
[Define to 1 if gd extension uses GD library bundled in PHP.]) [Define to 1 if gd extension uses GD library bundled in PHP.])
AC_DEFINE(HAVE_GD_PNG, 1, [ ]) AC_DEFINE([HAVE_GD_PNG], [1],
AC_DEFINE(HAVE_GD_BMP, 1, [ ]) [Define to 1 if gd extension has PNG support.])
AC_DEFINE(HAVE_GD_TGA, 1, [ ]) AC_DEFINE([HAVE_GD_BMP], [1],
[Define to 1 if gd extension has BMP support.])
AC_DEFINE([HAVE_GD_TGA], [1],
[Define to 1 if gd extension has TGA support.])
dnl Various checks for GD features dnl Various checks for GD features
PHP_SETUP_ZLIB([GD_SHARED_LIBADD]) PHP_SETUP_ZLIB([GD_SHARED_LIBADD])

24
ext/gd/config.w32
View file

@ -26,8 +26,8 @@ if (PHP_GD != "no") {
if ((CHECK_LIB("libwebp_a.lib", "gd", PHP_GD) || CHECK_LIB("libwebp.lib", "gd", PHP_GD)) && if ((CHECK_LIB("libwebp_a.lib", "gd", PHP_GD) || CHECK_LIB("libwebp.lib", "gd", PHP_GD)) &&
CHECK_HEADER_ADD_INCLUDE("decode.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\webp") && CHECK_HEADER_ADD_INCLUDE("decode.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\webp") &&
CHECK_HEADER_ADD_INCLUDE("encode.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\webp")) { CHECK_HEADER_ADD_INCLUDE("encode.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\webp")) {
AC_DEFINE("HAVE_LIBWEBP", 1, "WebP support"); AC_DEFINE("HAVE_LIBWEBP", 1, "Define to 1 if you have the libwebp library.");
AC_DEFINE("HAVE_GD_WEBP", 1, "WebP support"); AC_DEFINE("HAVE_GD_WEBP", 1, "Define to 1 if gd extension has WebP support.");
} else { } else {
WARNING("libwebp not enabled; libraries and headers not found"); WARNING("libwebp not enabled; libraries and headers not found");
} }
@ -56,16 +56,16 @@ if (PHP_GD != "no") {
gd_filter.c gd_pixelate.c gd_rotate.c gd_color_match.c gd_webp.c gd_avif.c \ gd_filter.c gd_pixelate.c gd_rotate.c gd_color_match.c gd_webp.c gd_avif.c \
gd_crop.c gd_interpolation.c gd_matrix.c gd_bmp.c gd_tga.c", "gd"); gd_crop.c gd_interpolation.c gd_matrix.c gd_bmp.c gd_tga.c", "gd");
AC_DEFINE('HAVE_GD_BUNDLED', 1, "Define to 1 if gd extension uses GD library bundled in PHP."); AC_DEFINE('HAVE_GD_BUNDLED', 1, "Define to 1 if gd extension uses GD library bundled in PHP.");
AC_DEFINE('HAVE_GD_PNG', 1, "PNG support"); AC_DEFINE('HAVE_GD_PNG', 1, "Define to 1 if gd extension has PNG support.");
AC_DEFINE('HAVE_GD_BMP', 1, "BMP support"); AC_DEFINE('HAVE_GD_BMP', 1, "Define to 1 if gd extension has BMP support.");
AC_DEFINE('HAVE_GD_TGA', 1, "TGA support"); AC_DEFINE('HAVE_GD_TGA', 1, "Define to 1 if gd extension has TGA support.");
AC_DEFINE('HAVE_LIBPNG', 1, "PNG support"); AC_DEFINE('HAVE_LIBPNG', 1, "Define to 1 if you have the libpng library.");
AC_DEFINE('HAVE_LIBJPEG', 1, "JPEG support"); AC_DEFINE('HAVE_LIBJPEG', 1, "Define to 1 if you have the libjpeg library.");
AC_DEFINE('HAVE_GD_JPG', 1, "JPEG support"); AC_DEFINE('HAVE_GD_JPG', 1, "Define to 1 if gd extension has JPEG support.");
AC_DEFINE('HAVE_XPM', 1, "XPM support"); AC_DEFINE('HAVE_XPM', 1, "Define to 1 if you have the xpm library.");
AC_DEFINE('HAVE_GD_XPM', 1, "XPM support"); AC_DEFINE('HAVE_GD_XPM', 1, "Define to 1 if gd extension has XPM support.");
AC_DEFINE('HAVE_LIBFREETYPE', 1, "Freetype support"); AC_DEFINE('HAVE_LIBFREETYPE', 1, "Define to 1 if you have the FreeType library.");
AC_DEFINE('HAVE_GD_FREETYPE', 1, "Freetype support"); AC_DEFINE('HAVE_GD_FREETYPE', 1, "Define to 1 if gd extension has FreeType support.");
ADD_FLAG("CFLAGS_GD", " \ ADD_FLAG("CFLAGS_GD", " \
/D PHP_GD_EXPORTS=1 \ /D PHP_GD_EXPORTS=1 \
/D HAVE_GD_GET_INTERPOLATION \ /D HAVE_GD_GET_INTERPOLATION \