cvs: php4 /sapi/apache config.m4 /sapi/apache2filter config.m4

sas Fri Apr 26 17:26:48 2002 EDT Modified files: /php4/sapi/apache config.m4 /php4/sapi/apache2filter config.m4 Log: be a bit more verbose about what is wrong Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.54 php4/sapi/apache/config.m4:1.55 --- php4/sapi/apache/config.m4:1.54 Thu Apr 25 23:06:52 2002 +++ php4/sapi/apache/config.m4 Fri Apr 26 17:26:42 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.54 2002/04/26 03:06:52 sniper Exp $ +dnl $Id: config.m4,v 1.55 2002/04/26 21:26:42 sas Exp $ dnl AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS) @@ -38,7 +38,7 @@ # Test that we're trying to configure with apache 1.x APACHE_VERSION=$APXS_HTTPD -v | head -1 | cut -f3 -d' ' | cut -f2 -d'/' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}' if test "$APACHE_VERSION" -ge 2000000; then - AC_MSG_ERROR([Use --with-apxs2 with Apache 2.x!]) + AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2]) fi for flag in $APXS_CFLAGS; do Index: php4/sapi/apache2filter/config.m4 diff -u php4/sapi/apache2filter/config.m4:1.12 php4/sapi/apache2filter/config.m4:1.13 --- php4/sapi/apache2filter/config.m4:1.12 Thu Apr 25 23:07:16 2002 +++ php4/sapi/apache2filter/config.m4 Fri Apr 26 17:26:47 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.12 2002/04/26 03:07:16 sniper Exp $ +dnl $Id: config.m4,v 1.13 2002/04/26 21:26:47 sas Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS) @@ -44,9 +44,9 @@ # Test that we're trying to configure with apache 2.x APACHE_VERSION=$APXS_HTTPD -v | head -1 | cut -f3 -d' ' | cut -f2 -d'/' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}' if test "$APACHE_VERSION" -le 2000000; then - AC_MSG_ERROR([Use --with-apxs with Apache 1.3.x!]) + 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)]) elif test "$APACHE_VERSION" -lt 2000035; then - AC_MSG_ERROR([Apache version >= 2.0.35 required.]) + AC_MSG_ERROR([Please note that Apache version >= 2.0.35 is required.]) fi case $host_alias in