Add AS_HELP_STRING to *nix build configure options

The Autoconf's default AS_HELP_STRING macro can properly format help
strings [1] so watching out if columns are aligned manually is not
anymore.

[1] https://www.gnu.org/software/autoconf/manual/autoconf.html#Pretty-Help-Strings

7 files changed, 72 insertions, 34 deletions

diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index 1e6916f602..d1d92db21f 100644
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -1,8 +1,11 @@
 dnl config.m4 for sapi apache2handler
 
-PHP_ARG_WITH(apxs2,,
-[  --with-apxs2[=FILE]       Build shared Apache 2.0 Handler module. FILE is the optional
-                          pathname to the Apache apxs tool [apxs]], no, no)
+PHP_ARG_WITH([apxs2],,
+  [AS_HELP_STRING([[--with-apxs2[=FILE]]],
+    [Build shared Apache 2.0 Handler module. FILE is the optional pathname to
+    the Apache apxs tool [apxs]])],
+  [no],
+  [no])
 
 AC_MSG_CHECKING([for Apache 2.0 handler-module support via DSO through APXS])
 
diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index bdf9edbdc1..f000b5eb88 100644
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -1,7 +1,10 @@
 dnl config.m4 for sapi cgi
 
-PHP_ARG_ENABLE(cgi,,
-[  --disable-cgi           Disable building CGI version of PHP], yes, no)
+PHP_ARG_ENABLE([cgi],,
+  [AS_HELP_STRING([--disable-cgi],
+    [Disable building CGI version of PHP])],
+  [yes],
+  [no])
 
 dnl
 dnl CGI setup
diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
index 93c9e7b702..0d2558eb83 100644
--- a/sapi/cli/config.m4
+++ b/sapi/cli/config.m4
@@ -1,8 +1,10 @@
 dnl config.m4 for sapi cli
 
-PHP_ARG_ENABLE(cli,,
-[  --disable-cli           Disable building CLI version of PHP
-                          (this forces --without-pear)], yes, no)
+PHP_ARG_ENABLE([cli],,
+  [AS_HELP_STRING([--disable-cli],
+    [Disable building CLI version of PHP (this forces --without-pear)])],
+  [yes],
+  [no])
 
 AC_CHECK_FUNCS(setproctitle)
 
diff --git a/sapi/embed/config.m4 b/sapi/embed/config.m4
index 78e2d15775..8fa55880fe 100644
--- a/sapi/embed/config.m4
+++ b/sapi/embed/config.m4
@@ -1,8 +1,11 @@
 dnl config.m4 for sapi embed
 
-PHP_ARG_ENABLE(embed,,
-[  --enable-embed[=TYPE]     EXPERIMENTAL: Enable building of embedded SAPI library
-                          TYPE is either 'shared' or 'static'. [TYPE=shared]], no, no)
+PHP_ARG_ENABLE([embed],,
+  [AS_HELP_STRING([[--enable-embed[=TYPE]]],
+    [EXPERIMENTAL: Enable building of embedded SAPI library TYPE is either
+    'shared' or 'static'. [TYPE=shared]])],
+  [no],
+  [no])
 
 AC_MSG_CHECKING([for embedded SAPI library support])
 
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 77d10ae562..2fbfc798c2 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -1,7 +1,10 @@
 dnl config.m4 for sapi fpm
 
-PHP_ARG_ENABLE(fpm,,
-[  --enable-fpm            Enable building of the fpm SAPI executable], no, no)
+PHP_ARG_ENABLE([fpm],,
+  [AS_HELP_STRING([--enable-fpm],
+    [Enable building of the fpm SAPI executable])],
+  [no],
+  [no])
 
 dnl configure checks {{{
 AC_DEFUN([AC_FPM_STDLIBS],
@@ -562,18 +565,30 @@ if test "$PHP_FPM" != "no"; then
   AC_FPM_SELECT
   AC_FPM_APPARMOR
 
-  PHP_ARG_WITH(fpm-user,,
-  [  --with-fpm-user[=USER]    Set the user for php-fpm to run as. (default: nobody)], nobody, no)
-
-  PHP_ARG_WITH(fpm-group,,
-  [  --with-fpm-group[=GRP]    Set the group for php-fpm to run as. For a system user, this
-                          should usually be set to match the fpm username (default: nobody)], nobody, no)
-
-  PHP_ARG_WITH(fpm-systemd,,
-  [  --with-fpm-systemd      Activate systemd integration], no, no)
-
-  PHP_ARG_WITH(fpm-acl,,
-  [  --with-fpm-acl          Use POSIX Access Control Lists], no, no)
+  PHP_ARG_WITH([fpm-user],,
+    [AS_HELP_STRING([[--with-fpm-user[=USER]]],
+      [Set the user for php-fpm to run as. (default: nobody)])],
+    [nobody],
+    [no])
+
+  PHP_ARG_WITH([fpm-group],,
+    [AS_HELP_STRING([[--with-fpm-group[=GRP]]],
+      [Set the group for php-fpm to run as. For a system user, this should
+      usually be set to match the fpm username (default: nobody)])],
+    [nobody],
+    [no])
+
+  PHP_ARG_WITH([fpm-systemd],,
+    [AS_HELP_STRING([--with-fpm-systemd],
+      [Activate systemd integration])],
+    [no],
+    [no])
+
+  PHP_ARG_WITH([fpm-acl],,
+    [AS_HELP_STRING([--with-fpm-acl],
+      [Use POSIX Access Control Lists])],
+    [no],
+    [no])
 
   if test "$PHP_FPM_SYSTEMD" != "no" ; then
     if test -z "$PKG_CONFIG"; then
diff --git a/sapi/litespeed/config.m4 b/sapi/litespeed/config.m4
index eba8642eb4..3e9175ae2d 100644
--- a/sapi/litespeed/config.m4
+++ b/sapi/litespeed/config.m4
@@ -2,8 +2,10 @@ dnl config.m4 for sapi litespeed
 
 AC_MSG_CHECKING(for LiteSpeed support)
 
-PHP_ARG_WITH(litespeed,,
-[  --with-litespeed        Build PHP as litespeed module], no)
+PHP_ARG_WITH([litespeed],,
+  [AS_HELP_STRING([--with-litespeed],
+    [Build PHP as litespeed module])],
+  [no])
 
 if test "$PHP_LITESPEED" != "no"; then
   PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/litespeed/Makefile.frag,$abs_srcdir/sapi/litespeed,sapi/litespeed)
diff --git a/sapi/phpdbg/config.m4 b/sapi/phpdbg/config.m4
index 76162a129d..a3f7a4028b 100644
--- a/sapi/phpdbg/config.m4
+++ b/sapi/phpdbg/config.m4
@@ -1,14 +1,24 @@
 dnl config.m4 for sapi phpdbg
 
-PHP_ARG_ENABLE(phpdbg, for phpdbg support,
-[  --enable-phpdbg         Build phpdbg], yes, yes)
+PHP_ARG_ENABLE([phpdbg],
+  [for phpdbg support],
+  [AS_HELP_STRING([--enable-phpdbg],
+    [Build phpdbg])],
+  [yes],
+  [yes])
 
-PHP_ARG_ENABLE(phpdbg-webhelper, for phpdbg web SAPI support,
-[  --enable-phpdbg-webhelper
-                          Build phpdbg web SAPI support], no)
+PHP_ARG_ENABLE([phpdbg-webhelper],
+  [for phpdbg web SAPI support],
+  [AS_HELP_STRING([--enable-phpdbg-webhelper],
+    [Build phpdbg web SAPI support])],
+  [no])
 
-PHP_ARG_ENABLE(phpdbg-debug, for phpdbg debug build,
-[  --enable-phpdbg-debug   Build phpdbg in debug mode], no, no)
+PHP_ARG_ENABLE([phpdbg-debug],
+  [for phpdbg debug build],
+  [AS_HELP_STRING([--enable-phpdbg-debug],
+    [Build phpdbg in debug mode])],
+  [no],
+  [no])
 
 if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then
   AC_HEADER_TIOCGWINSZ