Diff for /embedaddon/php/sapi/apache2filter/config.m4 between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:48:06 version 1.1.1.2, 2012/05/29 12:34:35
Line 39  if test "$PHP_APXS2FILTER" != "no"; then Line 39  if test "$PHP_APXS2FILTER" != "no"; then
   APXS_BINDIR=`$APXS -q BINDIR`    APXS_BINDIR=`$APXS -q BINDIR`
   APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`    APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
   APXS_CFLAGS=`$APXS -q CFLAGS`    APXS_CFLAGS=`$APXS -q CFLAGS`
   APXS_MPM=`$APXS -q MPM_NAME`  
   APU_BINDIR=`$APXS -q APU_BINDIR`    APU_BINDIR=`$APXS -q APU_BINDIR`
   APR_BINDIR=`$APXS -q APR_BINDIR`    APR_BINDIR=`$APXS -q APR_BINDIR`
   
Line 118  if test "$PHP_APXS2FILTER" != "no"; then Line 117  if test "$PHP_APXS2FILTER" != "no"; then
     ;;      ;;
   esac    esac
   
  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then  if test "$APACHE_VERSION" -lt 2004001; then
    PHP_BUILD_THREAD_SAFE    APXS_MPM=`$APXS -q MPM_NAME`
     if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
       PHP_BUILD_THREAD_SAFE
     fi
   else
     APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
     if test -n "$APACHE_THREADED_MPM"; then
       PHP_BUILD_THREAD_SAFE
     fi
   fi    fi
   AC_MSG_RESULT(yes)    AC_MSG_RESULT(yes)
   PHP_SUBST(APXS)    PHP_SUBST(APXS)

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


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