Skip to content

Simplify setpflags Autoconf check #13458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2024
Merged

Simplify setpflags Autoconf check #13458

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions sapi/fpm/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <priv.h>]], [[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
Expand Down Expand Up @@ -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
Expand All @@ -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)])],
Expand Down