Skip to content

Commit

Permalink
ext/gd: use --with instead of --enable
Browse files Browse the repository at this point in the history
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
  • Loading branch information
eli-schwartz authored and nikic committed Dec 26, 2018
1 parent f44d53b commit 285a077
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion UPGRADING
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ PHP 7.4 UPGRADE NOTES

- GD:
. Freetype detection now relies on pkg-config. The --with-freetype-dir option
has been renamed to --enable-freetype and no longer accepts a directory.
has been renamed to --with-freetype and no longer accepts a directory.
Instead pkg-config environment variables can be used to configure custom paths,
see either ./configure --help or follow the instructions in error messages.
. The behavior of imagecropauto() in the bundled libgd has been synced with
Expand Down
4 changes: 2 additions & 2 deletions ext/gd/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ fi
PHP_ARG_WITH(xpm-dir, for the location of libXpm,
[ --with-xpm-dir[=DIR] GD: Set the path to libXpm install prefix], no, no)

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

PHP_ARG_ENABLE(gd-jis-conv, whether to enable JIS-mapped Japanese font support in GD,
[ --enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support], no, no)
Expand Down
2 changes: 1 addition & 1 deletion travis/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ $TS \
--with-pspell=/usr \
--with-enchant=/usr \
--enable-wddx \
--enable-freetype \
--with-freetype \
--with-xpm-dir=/usr \
--with-kerberos \
--enable-sysvmsg \
Expand Down

0 comments on commit 285a077

Please sign in to comment.