diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-03-03 16:44:16 +0100 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-03-07 20:36:59 +0100 |
| commit | 9df6a1e4dd84a39bfaec70d7d008b61f7bbae347 (patch) | |
| tree | e2fab1605436e20d798d7b8c17ec84aa8c28d25b /sapi/fpm | |
| parent | 2580a7ba092b4ed9f4a9860d911e2e17ec545ef5 (diff) | |
| download | php-git-9df6a1e4dd84a39bfaec70d7d008b61f7bbae347.tar.gz | |
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
Diffstat (limited to 'sapi/fpm')
| -rw-r--r-- | sapi/fpm/config.m4 | 43 |
1 files changed, 29 insertions, 14 deletions
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 |