Skip to content

Commit

Permalink
Remove nsl library check in sapi/fpm (php#13478)
Browse files Browse the repository at this point in the history
In sapi/fpm the inet_ntop is used instead of the deprecated inet_addr
and the required library, if needed, is linked from the configure.ac.
  • Loading branch information
petk authored Feb 22, 2024
1 parent 205c8b6 commit 171e398
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions sapi/fpm/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ PHP_ARG_ENABLE([fpm],,
[no])

dnl Configure checks.
AC_DEFUN([AC_FPM_STDLIBS],
[
AC_CHECK_FUNCS(clearenv setproctitle setproctitle_fast)
AC_SEARCH_LIBS(inet_addr, nsl)
])

AC_DEFUN([AC_FPM_CLOCK],
[
have_clock_gettime=no
Expand Down Expand Up @@ -482,7 +475,6 @@ AC_MSG_CHECKING(for FPM build)
if test "$PHP_FPM" != "no"; then
AC_MSG_RESULT($PHP_FPM)

AC_FPM_STDLIBS
AC_FPM_CLOCK
AC_FPM_TRACE
AC_FPM_BUILTIN_ATOMIC
Expand All @@ -494,6 +486,8 @@ if test "$PHP_FPM" != "no"; then
AC_FPM_EPOLL
AC_FPM_SELECT

AC_CHECK_FUNCS([clearenv setproctitle setproctitle_fast])

AC_CHECK_HEADER([priv.h], [AC_CHECK_FUNCS([setpflags])])

PHP_ARG_WITH([fpm-user],,
Expand Down

0 comments on commit 171e398

Please sign in to comment.