From 476339646ca08af7ac627b1df6eebd8621793b5f Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Wed, 17 Jul 2019 03:50:47 +0200 Subject: [PATCH] Simplify functions checks in m4 - AC_CHECK_FUNCS already automatically defines belonging HAVE_function symbols and executes given shell code. --- Zend/Zend.m4 | 6 ++---- ext/pcntl/config.m4 | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index be45a5c600..d6919ae1e1 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -306,10 +306,8 @@ AC_ARG_ENABLE([zend-signals], [ZEND_SIGNALS=$enableval], [ZEND_SIGNALS=yes]) -AC_CHECK_FUNC(sigaction, [ - AC_DEFINE(HAVE_SIGACTION, 1, [Whether sigaction() is available]) -], [ - ZEND_SIGNALS=no +AC_CHECK_FUNCS([sigaction], [], [ + ZEND_SIGNALS=no ]) if test "$ZEND_SIGNALS" = "yes"; then AC_DEFINE(ZEND_SIGNALS, 1, [Use zend signal handling]) diff --git a/ext/pcntl/config.m4 b/ext/pcntl/config.m4 index 9b6957230d..332674df38 100644 --- a/ext/pcntl/config.m4 +++ b/ext/pcntl/config.m4 @@ -4,9 +4,9 @@ PHP_ARG_ENABLE([pcntl], [Enable pcntl support (CLI/CGI only)])]) if test "$PHP_PCNTL" != "no"; then - AC_CHECK_FUNCS(fork, [ AC_DEFINE(HAVE_FORK,1,[ ]) ], [ AC_MSG_ERROR(pcntl: fork() not supported by this platform) ]) - AC_CHECK_FUNCS(waitpid, [ AC_DEFINE(HAVE_WAITPID,1,[ ]) ], [ AC_MSG_ERROR(pcntl: waitpid() not supported by this platform) ]) - AC_CHECK_FUNCS(sigaction, [ AC_DEFINE(HAVE_SIGACTION,1,[ ]) ], [ AC_MSG_ERROR(pcntl: sigaction() not supported by this platform) ]) + AC_CHECK_FUNCS([fork], [], [AC_MSG_ERROR([pcntl: fork() not supported by this platform])]) + AC_CHECK_FUNCS([waitpid], [], [AC_MSG_ERROR([pcntl: waitpid() not supported by this platform])]) + AC_CHECK_FUNCS([sigaction], [], [AC_MSG_ERROR([pcntl: sigaction() not supported by this platform])]) AC_CHECK_FUNCS([getpriority setpriority wait3 wait4 sigwaitinfo sigtimedwait unshare]) AC_MSG_CHECKING([for siginfo_t]) -- 2.40.0