version 1.1.1.1, 2012/02/21 23:48:06
|
version 1.1.1.3, 2013/10/14 08:02:45
|
Line 38 if test "$PHP_APXS2" != "no"; then
|
Line 38 if test "$PHP_APXS2" != "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 62 if test "$PHP_APXS2" != "no"; then
|
Line 61 if test "$PHP_APXS2" != "no"; then
|
# Test that we're trying to configure with apache 2.x |
# Test that we're trying to configure with apache 2.x |
PHP_AP_EXTRACT_VERSION($APXS_HTTPD) |
PHP_AP_EXTRACT_VERSION($APXS_HTTPD) |
if test "$APACHE_VERSION" -le 2000000; then |
if test "$APACHE_VERSION" -le 2000000; then |
AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) | AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)]) |
elif test "$APACHE_VERSION" -lt 2000044; then |
elif test "$APACHE_VERSION" -lt 2000044; then |
AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) |
AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) |
fi |
fi |
Line 117 if test "$PHP_APXS2" != "no"; then
|
Line 116 if test "$PHP_APXS2" != "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) |