From b605fd9ec68ddc0b4e9ca2df9825f86106b7ab9c Mon Sep 17 00:00:00 2001 From: foobar Date: Sun, 14 Apr 2002 15:00:40 +0000 Subject: [PATCH] Make the configure fail if someone tries to use --with-apache with Apache2 --- sapi/apache/config.m4 | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4 index 92699a1e58..4e79763f90 100644 --- a/sapi/apache/config.m4 +++ b/sapi/apache/config.m4 @@ -101,32 +101,9 @@ AC_ARG_WITH(apache, 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 -- 2.50.1