Skip to content

Simplify times Autoconf check #13464

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 23, 2024
Merged

Simplify times Autoconf check #13464

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
14 changes: 1 addition & 13 deletions sapi/fpm/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,18 +330,6 @@ AC_DEFUN([AC_FPM_LQ],
fi
])

AC_DEFUN([AC_FPM_TIMES],
[
AC_MSG_CHECKING([for times])

AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/times.h>]], [[struct tms t; times(&t);]])],[
AC_DEFINE([HAVE_TIMES], 1, [do we have times?])
AC_MSG_RESULT([yes])
], [
AC_MSG_RESULT([no])
])
])

AC_DEFUN([AC_FPM_KQUEUE],
[
AC_MSG_CHECKING([for kqueue])
Expand Down Expand Up @@ -479,7 +467,6 @@ if test "$PHP_FPM" != "no"; then
AC_FPM_TRACE
AC_FPM_BUILTIN_ATOMIC
AC_FPM_LQ
AC_FPM_TIMES
AC_FPM_KQUEUE
AC_FPM_PORT
AC_FPM_DEVPOLL
Expand All @@ -489,6 +476,7 @@ if test "$PHP_FPM" != "no"; then
AC_CHECK_FUNCS([clearenv setproctitle setproctitle_fast])

AC_CHECK_HEADER([priv.h], [AC_CHECK_FUNCS([setpflags])])
AC_CHECK_HEADER([sys/times.h], [AC_CHECK_FUNCS([times])])

PHP_ARG_WITH([fpm-user],,
[AS_HELP_STRING([[--with-fpm-user[=USER]]],
Expand Down