cvs: php4(PHP_4_2_0) /sapi/apache config.m4 /sapi/apache2filter config.m4

sniper Fri Apr 12 20:18:55 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/sapi/apache config.m4 /php4/sapi/apache2filter config.m4 Log: MFH. (Prevent users from trying to build Apache 1.x module with Apache 2.x and vice-versa) Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.47 php4/sapi/apache/config.m4:1.47.2.1 --- php4/sapi/apache/config.m4:1.47 Mon Mar 4 12:46:19 2002 +++ php4/sapi/apache/config.m4 Fri Apr 12 20:18:54 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.47 2002/03/04 17:46:19 derick Exp $ +dnl $Id: config.m4,v 1.47.2.1 2002/04/13 00:18:54 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS) @@ -39,6 +39,12 @@ esac done PHP_ADD_INCLUDE($APXS_INCLUDEDIR) + + # Test that we're trying to configure with apache 1.x + if test -f "$APXS_INCLUDEDIR/ap_mpm.h"; then + AC_MSG_ERROR([Use --with-apxs2 with Apache 2.x!]) + fi + PHP_SAPI=apache # Test whether apxs support -S option Index: php4/sapi/apache2filter/config.m4 diff -u php4/sapi/apache2filter/config.m4:1.6.2.1 php4/sapi/apache2filter/config.m4:1.6.2.2 --- php4/sapi/apache2filter/config.m4:1.6.2.1 Wed Apr 10 05:43:07 2002 +++ php4/sapi/apache2filter/config.m4 Fri Apr 12 20:18:54 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.6.2.1 2002/04/10 09:43:07 sniper Exp $ +dnl $Id: config.m4,v 1.6.2.2 2002/04/13 00:18:54 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS) @@ -38,6 +38,12 @@ -D*) CPPFLAGS="$CPPFLAGS $flag";; esac done + + # Test that we're trying to configure with apache 2.x + if test ! -f "$APXS_INCLUDEDIR/ap_mpm.h"; then + AC_MSG_ERROR([Use --with-apxs with Apache 1.3.x!]) + fi + PHP_ADD_INCLUDE($APXS_INCLUDEDIR) PHP_SAPI=apache2filter INSTALL_IT="$APXS -i -a -n php4 $SAPI_LIBTOOL"