mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 03:44:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Autotools: Sync CS in gd extension (#15364)

Browse Source 
- Obsolete PHP_* variables checks removed (there was once the 'pdf'
  extension bundled in PHP that also had the same --with-*-dir configure
  options (3be17e3f26). When combined with
  the gd extension, options need to be executed conditionally; first one
  won), this is no longer relevant neither recommended practice to
  duplicate configure options inside the php-src context. Ideally,
  all configure options should be prefixed with an extension namespace
  --with-<extension-name>-<option> to be unique.
- AS_* macros used
This commit is contained in:
Peter Kokot 2024-08-12 21:38:30 +02:00 committed by GitHub
parent f5ae5ac804
commit 8c4f019cc6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
ext/gd/config.m4
View File

@ -13,32 +13,26 @@ PHP_ARG_WITH([external-gd],
[no],
[no])
if test -z "$PHP_AVIF"; then
PHP_ARG_WITH([avif],
[for libavif],
[AS_HELP_STRING([--with-avif],
[GD: Enable AVIF support (only for bundled libgd)])],
[no],
[no])
fi
PHP_ARG_WITH([avif],
[for libavif],
[AS_HELP_STRING([--with-avif],
[GD: Enable AVIF support (only for bundled libgd)])],
[no],
[no])
if test -z "$PHP_WEBP"; then
PHP_ARG_WITH([webp],
[for libwebp],
[AS_HELP_STRING([--with-webp],
[GD: Enable WEBP support (only for bundled libgd)])],
[no],
[no])
fi
PHP_ARG_WITH([webp],
[for libwebp],
[AS_HELP_STRING([--with-webp],
[GD: Enable WEBP support (only for bundled libgd)])],
[no],
[no])
if test -z "$PHP_JPEG"; then
PHP_ARG_WITH([jpeg],
[for libjpeg],
[AS_HELP_STRING([--with-jpeg],
[GD: Enable JPEG support (only for bundled libgd)])],
[no],
[no])
fi
PHP_ARG_WITH([jpeg],
[for libjpeg],
[AS_HELP_STRING([--with-jpeg],
[GD: Enable JPEG support (only for bundled libgd)])],
[no],
[no])
PHP_ARG_WITH([xpm],
[for libXpm],
@ -73,8 +67,8 @@ AC_DEFUN([PHP_GD_PNG],[
AC_DEFINE([HAVE_LIBPNG], [1], [Define to 1 if you have the libpng library.])
])
AC_DEFUN([PHP_GD_AVIF],[
if test "$PHP_AVIF" != "no"; then
AC_DEFUN([PHP_GD_AVIF], [
AS_VAR_IF([PHP_AVIF], [no],, [
PKG_CHECK_MODULES([AVIF], [libavif >= 0.8.2])
PHP_EVAL_LIBLINE([$AVIF_LIBS], [GD_SHARED_LIBADD])
PHP_EVAL_INCLINE([$AVIF_CFLAGS])
@ -82,11 +76,11 @@ AC_DEFUN([PHP_GD_AVIF],[
[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
])
])
AC_DEFUN([PHP_GD_WEBP],[
if test "$PHP_WEBP" != "no"; then
AS_VAR_IF([PHP_WEBP], [no],, [
PKG_CHECK_MODULES([WEBP], [libwebp >= 0.2.0])
PHP_EVAL_LIBLINE([$WEBP_LIBS], [GD_SHARED_LIBADD])
PHP_EVAL_INCLINE([$WEBP_CFLAGS])
@ -94,11 +88,11 @@ AC_DEFUN([PHP_GD_WEBP],[
[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
])
])
AC_DEFUN([PHP_GD_JPEG],[
if test "$PHP_JPEG" != "no"; then
AS_VAR_IF([PHP_JPEG], [no],, [
PKG_CHECK_MODULES([JPEG], [libjpeg])
PHP_EVAL_LIBLINE([$JPEG_LIBS], [GD_SHARED_LIBADD])
PHP_EVAL_INCLINE([$JPEG_CFLAGS])
@ -106,40 +100,39 @@ AC_DEFUN([PHP_GD_JPEG],[
[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
])
])
AC_DEFUN([PHP_GD_XPM],[
if test "$PHP_XPM" != "no"; then
AS_VAR_IF([PHP_XPM], [no],, [
PKG_CHECK_MODULES([XPM], [xpm])
PHP_EVAL_LIBLINE([$XPM_LIBS], [GD_SHARED_LIBADD])
PHP_EVAL_INCLINE([$XPM_CFLAGS])
AC_DEFINE([HAVE_XPM], [1], [Define to 1 if you have the xpm library.])
AC_DEFINE([HAVE_GD_XPM], [1],
[Define to 1 if gd extension has XPM support.])
fi
])
])
AC_DEFUN([PHP_GD_FREETYPE2],[
if test "$PHP_FREETYPE" != "no"; then
AS_VAR_IF([PHP_FREETYPE], [no],, [
PKG_CHECK_MODULES([FREETYPE2], [freetype2])
PHP_EVAL_INCLINE([$FREETYPE2_CFLAGS])
PHP_EVAL_LIBLINE([$FREETYPE2_LIBS], [GD_SHARED_LIBADD])
AC_DEFINE([HAVE_LIBFREETYPE], [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
])
])
AC_DEFUN([PHP_GD_JISX0208],[
if test "$PHP_GD_JIS_CONV" = "yes"; then
AS_VAR_IF([PHP_GD_JIS_CONV], [yes], [
AC_DEFINE([USE_GD_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
])
])
dnl
@ -222,7 +215,6 @@ dnl Main GD configure
dnl
if test "$PHP_GD" != "no"; then
if test "$PHP_EXTERNAL_GD" = "no"; then
extra_sources=m4_normalize(["
libgd/gd_avif.c