From 28ef78e4cbb0adf81ed3d3b20da35d3420179184 Mon Sep 17 00:00:00 2001
From: Ryan Bloom <rbb@php.net>
Date: Mon, 27 Dec 1999 23:42:46 +0000
Subject: [PATCH] Beginning work to get PHP 4 to work with Apache 2.0.  This
 change detects Apache 2.0 properly. # This is extremely experimental because
 neither project is release # quality yet.  I expect this to drive bugs out of
 Apache 2.0's configure # process as well as provide a useful version of PHP
 for Apache 2.0, so it # may take some time for this to become stable.  I will
 commit changes to # PHP as needed although more modifications will be on the
 Apache side.

---
 sapi/apache/config.m4 | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 5d94ff5f40..0e6a7aff39 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -73,6 +73,34 @@ AC_ARG_WITH(apache,
 			if test -f $withval/src/ap_config.h; then
 				AC_DEFINE(HAVE_AP_CONFIG_H)
 			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_DEFINE(APACHE)
+			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)
+			fi
+			if test -f $withval/src/include/ap_compat.h; then
+				AC_DEFINE(HAVE_AP_COMPAT_H)
+				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)
+				fi
+			fi
 		# For Apache 1.3.x
 		elif test -f $withval/src/main/httpd.h; then
 			APACHE_HAS_REGEX=1
-- 
2.40.0