diff options
| author | Jérôme Loyet <fat@php.net> | 2011-06-23 08:03:52 +0000 |
|---|---|---|
| committer | Jérôme Loyet <fat@php.net> | 2011-06-23 08:03:52 +0000 |
| commit | 73b6310098b2809d8ba7354607cd43391a803969 (patch) | |
| tree | 07a3a796700fff472c3abcd9dde922410a961a2c /sapi/fpm/config.m4 | |
| parent | 34ef66d7a45eec1702cf783147dc4d3f8b91fc68 (diff) | |
| download | php-git-73b6310098b2809d8ba7354607cd43391a803969.tar.gz | |
- Added custom access log (also added per request %CPU and memory mesurement)
Diffstat (limited to 'sapi/fpm/config.m4')
| -rw-r--r-- | sapi/fpm/config.m4 | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 index bb31d3b9b6..751f866bb2 100644 --- a/sapi/fpm/config.m4 +++ b/sapi/fpm/config.m4 @@ -340,6 +340,33 @@ AC_DEFUN([AC_FPM_LQ], ]) dnl }}} +AC_DEFUN([AC_FPM_SYSCONF], +[ + AC_MSG_CHECKING([for sysconf]) + + AC_TRY_COMPILE([ #include <unistd.h> ], [sysconf(_SC_CLK_TCK);], [ + AC_DEFINE([HAVE_SYSCONF], 1, [do we have sysconf?]) + AC_MSG_RESULT([yes]) + ], [ + AC_MSG_RESULT([no]) + ]) +]) +dnl }}} + +AC_DEFUN([AC_FPM_TIMES], +[ + AC_MSG_CHECKING([for times]) + + AC_TRY_COMPILE([ #include <sys/times.h> ], [struct tms t; times(&t);], [ + AC_DEFINE([HAVE_TIMES], 1, [do we have times?]) + AC_MSG_RESULT([yes]) + ], [ + AC_MSG_RESULT([no]) + ]) +]) +dnl }}} + + AC_MSG_CHECKING(for FPM build) if test "$PHP_FPM" != "no"; then AC_MSG_RESULT($PHP_FPM) @@ -350,6 +377,8 @@ if test "$PHP_FPM" != "no"; then AC_FPM_TRACE AC_FPM_BUILTIN_ATOMIC AC_FPM_LQ + AC_FPM_SYSCONF + AC_FPM_TIMES PHP_ARG_WITH(fpm-user,, [ --with-fpm-user[=USER] Set the user for php-fpm to run as. (default: nobody)], nobody, no) @@ -402,6 +431,7 @@ if test "$PHP_FPM" != "no"; then fpm/fpm_conf.c \ fpm/fpm_env.c \ fpm/fpm_events.c \ + fpm/fpm_log.c \ fpm/fpm_main.c \ fpm/fpm_php.c \ fpm/fpm_php_trace.c \ |