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:
https://github.com/php/php-src/pull/3632#discussion_r229474568
https://autotools.io/autoconf/arguments.html

diff --git a/UPGRADING b/UPGRADING
index 738c02c15c4537972271eb1893638cefbe2cbdc9..7d180e0a913cf7ffeb2dbeed9bcd1a194b5bd856 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -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

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 70da35facfcfaa11e54f1d49ed92df37bca3091a..fc4d06521d4d6079120f5239f9b7d6b212bb4ca8 100644 (file)
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -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)

diff --git a/travis/compile.sh b/travis/compile.sh
index d6bd887c85da5494262d0460ffafda99e88291f4..5de9ed8446afa6611ed8d7178f62e2094caf6ef2 100755 (executable)
--- a/travis/compile.sh
+++ b/travis/compile.sh
@@ -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 \