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

sniper Sun Apr 14 11:00:41 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/sapi/apache config.m4 Log: Make the configure fail if someone tries to use --with-apache with Apache2 Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.47.2.1 php4/sapi/apache/config.m4:1.47.2.2 --- php4/sapi/apache/config.m4:1.47.2.1 Fri Apr 12 20:18:54 2002 +++ php4/sapi/apache/config.m4 Sun Apr 14 11:00:40 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.47.2.1 2002/04/13 00:18:54 sniper Exp $ +dnl $Id: config.m4,v 1.47.2.2 2002/04/14 15:00:40 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS) @@ -101,32 +101,9 @@ AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ]) fi # For Apache 2.0.x - elif test -f $withval/src/include/httpd.h && - test -f $withval/src/lib/apr/include/apr_general.h ; then - APACHE_HAS_REGEX=1 - APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix -I$withval/src/lib/apr/include" - APACHE_TARGET=$withval/src/modules/php4 - if test ! -d $APACHE_TARGET; then - mkdir $APACHE_TARGET - fi - PHP_SAPI=apache - APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" - PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4" - AC_MSG_RESULT(yes - Apache 2.0.X) - STRONGHOLD= - if test -f $withval/src/include/ap_config.h; then - AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ]) - fi - if test -f $withval/src/include/ap_compat.h; then - AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ]) - if test ! -f $withval/src/include/ap_config_auto.h; then - AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again) - fi - else - if test -f $withval/src/include/compat.h; then - AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ]) - fi - fi + elif test -f $withval/include/httpd.h && + test -f $withval/srclib/apr/include/apr_general.h ; then + AC_MSG_ERROR([--with-apache does not work with Apache 2.x!]) # For Apache 1.3.x elif test -f $withval/src/main/httpd.h; then APACHE_HAS_REGEX=1