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

sniper Fri Apr 12 18:59:07 2002 EDT Modified files: /php4/sapi/apache config.m4 /php4/sapi/apache2filter config.m4 Log: - Added checks to prevent building the DSO with wrong configure option. Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.50 php4/sapi/apache/config.m4:1.51 --- php4/sapi/apache/config.m4:1.50 Fri Mar 29 22:17:25 2002 +++ php4/sapi/apache/config.m4 Fri Apr 12 18:59:06 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.50 2002/03/30 03:17:25 markonen Exp $ +dnl $Id: config.m4,v 1.51 2002/04/12 22:59:06 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS) @@ -55,6 +55,12 @@ PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php4.c php_apache.c) ;; esac + + # 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_ADD_INCLUDE($APXS_INCLUDEDIR) # Test whether apxs support -S option Index: php4/sapi/apache2filter/config.m4 diff -u php4/sapi/apache2filter/config.m4:1.8 php4/sapi/apache2filter/config.m4:1.9 --- php4/sapi/apache2filter/config.m4:1.8 Wed Apr 10 05:42:38 2002 +++ php4/sapi/apache2filter/config.m4 Fri Apr 12 18:59:07 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8 2002/04/10 09:42:38 sniper Exp $ +dnl $Id: config.m4,v 1.9 2002/04/12 22:59:07 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) INSTALL_IT="$APXS -i -a -n php4 $SAPI_LIBTOOL" PHP_BUILD_THREAD_SAFE