summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2019-07-17 03:50:47 +0200
committerPeter Kokot <peterkokot@gmail.com>2019-07-17 03:50:47 +0200
commit476339646ca08af7ac627b1df6eebd8621793b5f (patch)
tree820ba0bf484467f188324d5b881d9e6abbe24dfa
parentee5828205ea2fbebac5da1f3c1ded1c9b5c512e0 (diff)
downloadphp-git-476339646ca08af7ac627b1df6eebd8621793b5f.tar.gz
Simplify functions checks in m4
- AC_CHECK_FUNCS already automatically defines belonging HAVE_function symbols and executes given shell code.
-rw-r--r--Zend/Zend.m46
-rw-r--r--ext/pcntl/config.m46
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])