Skip to content

Commit 17a5347

Browse files
authored
Autotools: Refactor PHP_FPM_LQ checks (#14828)
- CS synced - checks wrapped in AC_CACHE_CHECH - HAVE_LQ_SO_LISTENQ defined unconditionally for simplifications
1 parent a62eda3 commit 17a5347

File tree

1 file changed

+28
-49
lines changed

1 file changed

+28
-49
lines changed

sapi/fpm/config.m4

Lines changed: 28 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -254,64 +254,43 @@ AC_DEFUN([PHP_FPM_BUILTIN_ATOMIC],
254254
])
255255

256256
AC_DEFUN([PHP_FPM_LQ],
257-
[
258-
have_lq=no
259-
260-
AC_MSG_CHECKING([for TCP_INFO])
261-
262-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netinet/tcp.h>]], [[
257+
[AC_CACHE_CHECK([for TCP_INFO], [php_cv_have_TCP_INFO],
258+
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netinet/tcp.h>], [
263259
struct tcp_info ti;
264260
int x = TCP_INFO;
265261
(void)ti;
266262
(void)x;
267-
]])], [
268-
have_lq=tcp_info
269-
AC_MSG_RESULT([yes])
270-
], [
271-
AC_MSG_RESULT([no])
272-
])
273-
274-
if test "$have_lq" = "tcp_info"; then
275-
AC_DEFINE([HAVE_LQ_TCP_INFO], 1, [do we have TCP_INFO?])
276-
fi
277-
278-
AC_MSG_CHECKING([for TCP_CONNECTION_INFO])
263+
])],
264+
[php_cv_have_TCP_INFO=yes],
265+
[php_cv_have_TCP_INFO=no])])
266+
AS_VAR_IF([php_cv_have_TCP_INFO], [yes],
267+
[AC_DEFINE([HAVE_LQ_TCP_INFO], [1], [Define to 1 if you have 'TCP_INFO'.])])
279268
280-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netinet/tcp.h>]], [[
269+
AC_CACHE_CHECK([for TCP_CONNECTION_INFO], [php_cv_have_TCP_CONNECTION_INFO]
270+
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netinet/tcp.h>], [
281271
struct tcp_connection_info ti;
282272
int x = TCP_CONNECTION_INFO;
283273
(void)ti;
284274
(void)x;
285-
]])], [
286-
have_lq=tcp_connection_info
287-
AC_MSG_RESULT([yes])
288-
], [
289-
AC_MSG_RESULT([no])
290-
])
291-
292-
if test "$have_lq" = "tcp_connection_info"; then
293-
AC_DEFINE([HAVE_LQ_TCP_CONNECTION_INFO], 1, [do we have TCP_CONNECTION_INFO?])
294-
fi
295-
296-
if test "$have_lq" = "no" ; then
297-
AC_MSG_CHECKING([for SO_LISTENQLEN])
298-
299-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[
300-
int x = SO_LISTENQLIMIT;
301-
int y = SO_LISTENQLEN;
302-
(void)x;
303-
(void)y;
304-
]])], [
305-
have_lq=so_listenq
306-
AC_MSG_RESULT([yes])
307-
], [
308-
AC_MSG_RESULT([no])
309-
])
310-
311-
if test "$have_lq" = "so_listenq"; then
312-
AC_DEFINE([HAVE_LQ_SO_LISTENQ], 1, [do we have SO_LISTENQ?])
313-
fi
314-
fi
275+
])],
276+
[php_cv_have_TCP_CONNECTION_INFO=yes],
277+
[php_cv_have_TCP_CONNECTION_INFO=no])])
278+
AS_VAR_IF([php_cv_have_TCP_CONNECTION_INFO], [yes],
279+
[AC_DEFINE([HAVE_LQ_TCP_CONNECTION_INFO], [1],
280+
[Define to 1 if you have 'TCP_CONNECTION_INFO'.])])
281+
282+
AC_CACHE_CHECK([for SO_LISTENQLEN], [php_cv_have_SO_LISTENQLEN],
283+
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/socket.h>], [
284+
int x = SO_LISTENQLIMIT;
285+
int y = SO_LISTENQLEN;
286+
(void)x;
287+
(void)y;
288+
])],
289+
[php_cv_have_SO_LISTENQLEN=yes],
290+
[php_cv_have_SO_LISTENQLEN=no])])
291+
AS_VAR_IF([php_cv_have_SO_LISTENQLEN], [yes],
292+
[AC_DEFINE([HAVE_LQ_SO_LISTENQ], [1],
293+
[Define to 1 if you have 'SO_LISTENQ*'.])])
315294
])
316295

317296
AC_DEFUN([PHP_FPM_KQUEUE],

0 commit comments

Comments
 (0)