From 7b2c67ca98d68daf6104df9af628eb3c3da6ff7c Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Wed, 21 Feb 2024 21:01:47 +0100 Subject: [PATCH] Simplify setpflags Autoconf check (#13458) Similar simplification as e72f0c887bad4070a55529bf6e5cd1930b7ee8cb. --- sapi/fpm/config.m4 | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 index a2aa53b2d3d..a5219dfcf57 100644 --- a/sapi/fpm/config.m4 +++ b/sapi/fpm/config.m4 @@ -12,18 +12,6 @@ AC_DEFUN([AC_FPM_STDLIBS], AC_SEARCH_LIBS(inet_addr, nsl) ]) -AC_DEFUN([AC_FPM_SETPFLAGS], -[ - AC_MSG_CHECKING([for setpflags]) - - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[setpflags(0, 0);]])], [ - AC_DEFINE([HAVE_SETPFLAGS], 1, [do we have setpflags?]) - AC_MSG_RESULT([yes]) - ], [ - AC_MSG_RESULT([no]) - ]) -]) - AC_DEFUN([AC_FPM_CLOCK], [ have_clock_gettime=no @@ -507,7 +495,6 @@ if test "$PHP_FPM" != "no"; then AC_MSG_RESULT($PHP_FPM) AC_FPM_STDLIBS - AC_FPM_SETPFLAGS AC_FPM_CLOCK AC_FPM_TRACE AC_FPM_BUILTIN_ATOMIC @@ -520,6 +507,8 @@ if test "$PHP_FPM" != "no"; then AC_FPM_EPOLL AC_FPM_SELECT + AC_CHECK_HEADER([priv.h], [AC_CHECK_FUNCS([setpflags])]) + PHP_ARG_WITH([fpm-user],, [AS_HELP_STRING([[--with-fpm-user[=USER]]], [Set the user for php-fpm to run as. (default: nobody)])],