summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Zend/Zend.m44
-rw-r--r--sapi/phpdbg/phpdbg.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index bdeac672b4..9d3b46a755 100644
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -370,10 +370,10 @@ AC_CHECK_FUNCS(mremap)
AC_ARG_ENABLE(zend-signals,
-[ --enable-zend-signals Use zend signal handling],[
+[ --disable-zend-signals whether to enable zend signal handling],[
ZEND_SIGNALS=$enableval
],[
- ZEND_SIGNALS=no
+ ZEND_SIGNALS=yes
])
AC_CHECK_FUNC(sigaction, [
diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h
index c77bc1c530..2f95a80f04 100644
--- a/sapi/phpdbg/phpdbg.h
+++ b/sapi/phpdbg/phpdbg.h
@@ -47,6 +47,9 @@
#include "zend_stream.h"
#ifndef _WIN32
# include "zend_signal.h"
+# if !defined(ZEND_SIGNALS) && defined(HAVE_SIGNAL_H)
+# include <signal.h>
+# endif
#endif
#include "SAPI.h"
#include <fcntl.h>