[BACK]Return to config.m4 CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / sapi / fpm

Diff for /embedaddon/php/sapi/fpm/config.m4 between versions 1.1.1.2.2.1 and 1.1.1.3.2.1

version 1.1.1.2.2.1, 2013/07/22 01:44:22 version 1.1.1.3.2.1, 2013/10/14 08:17:38
Line 16  AC_DEFUN([AC_FPM_STDLIBS], Line 16  AC_DEFUN([AC_FPM_STDLIBS],
   AC_CHECK_HEADERS([errno.h fcntl.h stdio.h stdlib.h unistd.h sys/uio.h])    AC_CHECK_HEADERS([errno.h fcntl.h stdio.h stdlib.h unistd.h sys/uio.h])
   AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/time.h])    AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/time.h])
   AC_CHECK_HEADERS([arpa/inet.h netinet/in.h])    AC_CHECK_HEADERS([arpa/inet.h netinet/in.h])
     AC_CHECK_HEADERS([sysexits.h])
 ])  ])
   
 AC_DEFUN([AC_FPM_PRCTL],  AC_DEFUN([AC_FPM_PRCTL],
Line 192  AC_DEFUN([AC_FPM_TRACE], Line 193  AC_DEFUN([AC_FPM_TRACE],
       have_ptrace=no        have_ptrace=no
       have_broken_ptrace=yes        have_broken_ptrace=yes
       AC_MSG_RESULT([no])        AC_MSG_RESULT([no])
       ], [
         AC_MSG_RESULT([skipped (cross compiling)])
     ])      ])
   fi    fi
   
Line 264  AC_DEFUN([AC_FPM_TRACE], Line 267  AC_DEFUN([AC_FPM_TRACE],
     ], [      ], [
       proc_mem_file=""        proc_mem_file=""
       AC_MSG_RESULT([no])        AC_MSG_RESULT([no])
       ], [
         AC_MSG_RESULT([skipped (cross compiling)])
     ])      ])
   fi    fi
       
Line 312  AC_DEFUN([AC_FPM_LQ], Line 317  AC_DEFUN([AC_FPM_LQ],
   
   AC_MSG_CHECKING([for TCP_INFO])    AC_MSG_CHECKING([for TCP_INFO])
   
  AC_TRY_COMPILE([ #include <netinet/tcp.h> ], [struct tcp_info ti; int x = TCP_INFO;], [  AC_TRY_COMPILE([ #include <netinet/tcp.h> ], [struct tcp_info ti; ti.tcpi_sacked = 0; int x = TCP_INFO;], [
     have_lq=tcp_info      have_lq=tcp_info
     AC_MSG_RESULT([yes])      AC_MSG_RESULT([yes])
   ], [    ], [
Line 333  AC_DEFUN([AC_FPM_LQ], Line 338  AC_DEFUN([AC_FPM_LQ],
       AC_MSG_RESULT([no])        AC_MSG_RESULT([no])
     ])      ])
   
    if test "$have_lq" = "tcp_info"; then    if test "$have_lq" = "so_listenq"; then
       AC_DEFINE([HAVE_LQ_SO_LISTENQ], 1, [do we have SO_LISTENQxxx?])        AC_DEFINE([HAVE_LQ_SO_LISTENQ], 1, [do we have SO_LISTENQxxx?])
     fi      fi
   fi    fi
Line 558  if test "$PHP_FPM" != "no"; then Line 563  if test "$PHP_FPM" != "no"; then
   [  --with-fpm-group[=GRP]  Set the group for php-fpm to run as. For a system user, this     [  --with-fpm-group[=GRP]  Set the group for php-fpm to run as. For a system user, this 
                   should usually be set to match the fpm username (default: nobody)], nobody, no)                    should usually be set to match the fpm username (default: nobody)], nobody, no)
   
     PHP_ARG_WITH(fpm-systemd,,
     [  --with-fpm-systemd      Activate systemd integration], no, no)
   
     if test "$PHP_FPM_SYSTEMD" != "no" ; then
       AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon")
       AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H="yes"], [HAVE_SD_DAEMON_H="no"])
       if test $HAVE_SD_DAEMON_H = "no" || test -z "${SYSTEMD_LIBS}"; then
         AC_MSG_ERROR([Your system does not support systemd.])
       else
         AC_DEFINE(HAVE_SYSTEMD, 1, [FPM use systemd integration])
         PHP_FPM_SD_FILES="fpm/fpm_systemd.c"
         PHP_ADD_LIBRARY(systemd-daemon)
         php_fpm_systemd=notify
       fi
     else
       php_fpm_systemd=simple
     fi
     PHP_SUBST_OLD(php_fpm_systemd)
     AC_DEFINE_UNQUOTED(PHP_FPM_SYSTEMD, "$php_fpm_systemd", [fpm systemd service type])
   
   if test -z "$PHP_FPM_USER" -o "$PHP_FPM_USER" = "yes" -o "$PHP_FPM_USER" = "no"; then    if test -z "$PHP_FPM_USER" -o "$PHP_FPM_USER" = "yes" -o "$PHP_FPM_USER" = "no"; then
     php_fpm_user="nobody"      php_fpm_user="nobody"
   else    else
Line 582  if test "$PHP_FPM" != "no"; then Line 607  if test "$PHP_FPM" != "no"; then
   AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])    AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])
   AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name])    AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name])
   
     AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])
     AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name])
   
   PHP_ADD_BUILD_DIR(sapi/fpm/fpm)    PHP_ADD_BUILD_DIR(sapi/fpm/fpm)
   PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events)    PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events)
  PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.8 sapi/fpm/status.html)  PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)
   PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])    PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])
   
   SAPI_FPM_PATH=sapi/fpm/php-fpm    SAPI_FPM_PATH=sapi/fpm/php-fpm
   
       
   if test "$fpm_trace_type" && test -f "$abs_srcdir/sapi/fpm/fpm/fpm_trace_$fpm_trace_type.c"; then    if test "$fpm_trace_type" && test -f "$abs_srcdir/sapi/fpm/fpm/fpm_trace_$fpm_trace_type.c"; then
     PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c"      PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c"
Line 626  if test "$PHP_FPM" != "no"; then Line 655  if test "$PHP_FPM" != "no"; then
                 fpm/events/port.c \                  fpm/events/port.c \
   "    "
   
  PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)')  PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES $PHP_FPM_SD_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)')
   
   case $host_alias in    case $host_alias in
       *aix*)        *aix*)
Removed from v.1.1.1.2.2.1  
changed lines
  Added in v.1.1.1.3.2.1

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>