diff options
| author | Remi Collet <remi@remirepo.net> | 2019-07-22 11:47:38 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2019-07-22 16:14:19 +0200 |
| commit | 31d85b84178d81f64437aec185099231767f3a31 (patch) | |
| tree | 6c6e38c72536aaa6b804ea1e6b40c7392c9209ff /ext/gd/config.m4 | |
| parent | a2b758dab5b5707e8d3efe18d7489349f8a60a1d (diff) | |
| download | php-git-31d85b84178d81f64437aec185099231767f3a31.tar.gz | |
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
Diffstat (limited to 'ext/gd/config.m4')
| -rw-r--r-- | ext/gd/config.m4 | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 2011aaf849..194687208d 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -17,7 +17,7 @@ if test -z "$PHP_WEBP"; then PHP_ARG_WITH([webp], [for libwebp], [AS_HELP_STRING([--with-webp], - [GD: Enable WEBP support])], + [GD: Enable WEBP support (only for bundled libgd)])], [no], [no]) fi @@ -26,7 +26,7 @@ if test -z "$PHP_JPEG"; then PHP_ARG_WITH([jpeg], [for libjpeg], [AS_HELP_STRING([--with-jpeg], - [GD: Enable JPEG support])], + [GD: Enable JPEG support (only for bundled libgd)])], [no], [no]) fi @@ -34,21 +34,21 @@ fi PHP_ARG_WITH([xpm], [for libXpm], [AS_HELP_STRING([--with-xpm], - [GD: Enable XPM support])], + [GD: Enable XPM support (only for bundled libgd)])], [no], [no]) PHP_ARG_WITH([freetype], [for FreeType 2], [AS_HELP_STRING([--with-freetype], - [GD: Enable FreeType 2 support])], + [GD: Enable FreeType 2 support (only for bundled libgd)])], [no], [no]) PHP_ARG_ENABLE([gd-jis-conv], [whether to enable JIS-mapped Japanese font support in GD], [AS_HELP_STRING([--enable-gd-jis-conv], - [GD: Enable JIS-mapped Japanese font support])], + [GD: Enable JIS-mapped Japanese font support (only for bundled libgd)])], [no], [no]) @@ -176,15 +176,6 @@ dnl Various checks for GD features ], [ $GD_SHARED_LIBADD ], [char foobar () {}]) else - dnl for png.h in gd_compat (PNG_LIBPNG_VER_STRING) - PHP_GD_PNG - dnl for jpeglib.h in gd_compat (JPEG_LIB_VERSION) - PHP_GD_JPEG - dnl for X11/xpm.h in gd.c (XpmLibraryVersion) - PHP_GD_XPM - dnl for ft2build.h in gd.c (FREETYPE_MAJOR...) - PHP_GD_FREETYPE2 - extra_sources="gd_compat.c" PKG_CHECK_MODULES([GDLIB], [gdlib >= 2.1.0]) PHP_EVAL_LIBLINE($GDLIB_LIBS, GD_SHARED_LIBADD) |