Skip to content

Commit 285a077

Browse files
eli-schwartznikic
authored andcommitted
ext/gd: use --with instead of --enable
By convention it probably makes sense to stick with this even when dropping the *-dir=DIR part. See: #3632 (comment) https://autotools.io/autoconf/arguments.html
1 parent f44d53b commit 285a077

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

UPGRADING

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ PHP 7.4 UPGRADE NOTES
130130

131131
- GD:
132132
. Freetype detection now relies on pkg-config. The --with-freetype-dir option
133-
has been renamed to --enable-freetype and no longer accepts a directory.
133+
has been renamed to --with-freetype and no longer accepts a directory.
134134
Instead pkg-config environment variables can be used to configure custom paths,
135135
see either ./configure --help or follow the instructions in error messages.
136136
. The behavior of imagecropauto() in the bundled libgd has been synced with

ext/gd/config.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ fi
3030
PHP_ARG_WITH(xpm-dir, for the location of libXpm,
3131
[ --with-xpm-dir[=DIR] GD: Set the path to libXpm install prefix], no, no)
3232

33-
PHP_ARG_ENABLE(freetype, for FreeType 2,
34-
[ --enable-freetype GD: Enable FreeType 2 support], no, no)
33+
PHP_ARG_WITH(freetype, for FreeType 2,
34+
[ --with-freetype GD: Enable FreeType 2 support], no, no)
3535

3636
PHP_ARG_ENABLE(gd-jis-conv, whether to enable JIS-mapped Japanese font support in GD,
3737
[ --enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support], no, no)

travis/compile.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ $TS \
7070
--with-pspell=/usr \
7171
--with-enchant=/usr \
7272
--enable-wddx \
73-
--enable-freetype \
73+
--with-freetype \
7474
--with-xpm-dir=/usr \
7575
--with-kerberos \
7676
--enable-sysvmsg \

0 commit comments

Comments
 (0)