Skip to content

Commit 171e398

Browse files
authored
Remove nsl library check in sapi/fpm (php#13478)
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.
1 parent 205c8b6 commit 171e398

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

sapi/fpm/config.m4

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ PHP_ARG_ENABLE([fpm],,
55
[no])
66

77
dnl Configure checks.
8-
AC_DEFUN([AC_FPM_STDLIBS],
9-
[
10-
AC_CHECK_FUNCS(clearenv setproctitle setproctitle_fast)
11-
12-
AC_SEARCH_LIBS(inet_addr, nsl)
13-
])
14-
158
AC_DEFUN([AC_FPM_CLOCK],
169
[
1710
have_clock_gettime=no
@@ -482,7 +475,6 @@ AC_MSG_CHECKING(for FPM build)
482475
if test "$PHP_FPM" != "no"; then
483476
AC_MSG_RESULT($PHP_FPM)
484477

485-
AC_FPM_STDLIBS
486478
AC_FPM_CLOCK
487479
AC_FPM_TRACE
488480
AC_FPM_BUILTIN_ATOMIC
@@ -494,6 +486,8 @@ if test "$PHP_FPM" != "no"; then
494486
AC_FPM_EPOLL
495487
AC_FPM_SELECT
496488

489+
AC_CHECK_FUNCS([clearenv setproctitle setproctitle_fast])
490+
497491
AC_CHECK_HEADER([priv.h], [AC_CHECK_FUNCS([setpflags])])
498492

499493
PHP_ARG_WITH([fpm-user],,

0 commit comments

Comments
 (0)