@@ -26,7 +26,8 @@ if (PHP_GD != "no") {
26
26
if ( ( CHECK_LIB ( "libwebp_a.lib" , "gd" , PHP_GD ) || CHECK_LIB ( "libwebp.lib" , "gd" , PHP_GD ) ) &&
27
27
CHECK_HEADER_ADD_INCLUDE ( "decode.h" , "CFLAGS_GD" , PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\webp" ) &&
28
28
CHECK_HEADER_ADD_INCLUDE ( "encode.h" , "CFLAGS_GD" , PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\webp" ) ) {
29
- ADD_FLAG ( "CFLAGS_GD" , "/D HAVE_LIBWEBP /D HAVE_GD_WEBP" ) ;
29
+ AC_DEFINE ( "HAVE_LIBWEBP" , 1 , "WebP support" ) ;
30
+ AC_DEFINE ( "HAVE_GD_WEBP" , 1 , "WebP support" ) ;
30
31
} else {
31
32
WARNING ( "libwebp not enabled; libraries and headers not found" ) ;
32
33
}
@@ -55,10 +56,20 @@ if (PHP_GD != "no") {
55
56
gd_filter.c gd_pixelate.c gd_rotate.c gd_color_match.c gd_webp.c gd_avif.c \
56
57
gd_crop.c gd_interpolation.c gd_matrix.c gd_bmp.c gd_tga.c" , "gd" ) ;
57
58
AC_DEFINE ( 'HAVE_LIBGD' , 1 , 'GD support' ) ;
59
+ AC_DEFINE ( 'HAVE_GD_BUNDLED' , 1 , "Bundled GD" ) ;
60
+ AC_DEFINE ( 'HAVE_GD_PNG' , 1 , "PNG support" ) ;
61
+ AC_DEFINE ( 'HAVE_GD_BMP' , 1 , "BMP support" ) ;
62
+ AC_DEFINE ( 'HAVE_GD_TGA' , 1 , "TGA support" ) ;
63
+ AC_DEFINE ( 'HAVE_LIBPNG' , 1 , "PNG support" ) ;
64
+ AC_DEFINE ( 'HAVE_LIBJPEG' , 1 , "JPEG support" ) ;
65
+ AC_DEFINE ( 'HAVE_GD_JPG' , 1 , "JPEG support" ) ;
66
+ AC_DEFINE ( 'HAVE_XPM' , 1 , "XPM support" ) ;
67
+ AC_DEFINE ( 'HAVE_GD_XPM' , 1 , "XPM support" ) ;
68
+ AC_DEFINE ( 'HAVE_LIBFREETYPE' , 1 , "Freetype support" ) ;
69
+ AC_DEFINE ( 'HAVE_GD_FREETYPE' , 1 , "Freetype support" ) ;
58
70
ADD_FLAG ( "CFLAGS_GD" , " \
59
71
/D PHP_GD_EXPORTS=1 \
60
72
/D HAVE_GD_DYNAMIC_CTX_EX=1 \
61
- /D HAVE_GD_BUNDLED=1 \
62
73
/D HAVE_GD_GD2 \
63
74
/D HAVE_GD_GIF_READ=1 \
64
75
/D HAVE_GD_GIF_CREATE=1 \
@@ -67,24 +78,14 @@ if (PHP_GD != "no") {
67
78
/D HAVE_GD_IMAGESETTILE=1 \
68
79
/D HAVE_GD_FONTCACHESHUTDOWN=1 \
69
80
/D HAVE_GD_FONTMUTEX=1 \
70
- /D HAVE_LIBFREETYPE=1 \
71
- /D HAVE_GD_JPG \
72
- /D HAVE_GD_PNG \
73
81
/D HAVE_GD_STRINGFTEX=1 \
74
82
/D HAVE_GD_STRINGTTF=1 \
75
83
/D HAVE_GD_WBMP \
76
84
/D HAVE_GD_XBM \
77
- /D HAVE_GD_XPM \
78
- /D HAVE_GD_FREETYPE=1 \
79
- /D HAVE_GD_BMP \
80
- /D HAVE_GD_TGA \
81
85
/D HAVE_LIBGD13=1 \
82
86
/D HAVE_LIBGD15=1 \
83
87
/D HAVE_LIBGD20=1 \
84
88
/D HAVE_LIBGD204=1 \
85
- /D HAVE_LIBJPEG \
86
- /D HAVE_LIBPNG \
87
- /D HAVE_XPM \
88
89
/D HAVE_COLORCLOSESTHWB \
89
90
/D HAVE_GD_GET_INTERPOLATION \
90
91
/D USE_GD_IOCTX \
0 commit comments