From 40f0c8fe04858acd724d6221dbf8a357259e5d6b Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Tue, 20 Jan 2004 16:27:35 +0000
Subject: split out version specific code

code compiles under apache 1.3 and 2.0
updated apache m4 script to detect both verions (two minumums)
defaulted install to not activate module in configuration file (use make activate)

---
(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index ed8e25d..63b71db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,11 +8,15 @@ AC_CONFIG_SRCDIR(mod_log_sql.c)
 dnl Add a test for a compiler.
 AC_PROG_CC
 
-APACHE_VERSION=2.0.44
-CHECK_PATH_APACHE($APACHE_VERSION,
-   		:,
-   		AC_MSG_ERROR([*** Apache version $APACHE_VERSION not found!])
-  		)
+APACHE20_VERSION=2.0.44
+APACHE13_VERSION=1.3.20
+CHECK_PATH_APACHE($APACHE13_VERSION,$APACHE20_VERSION,
+		:,
+		:,
+		AC_MSG_ERROR([*** The correct version Apache was not found!])
+		AC_MSG_ERROR([*** You need either Apache 1.3 version $APACHE13_VERSION or greater])
+		AC_MSG_ERROR([*** or Apache 2.0/2.1 version $APACHE20_VERSION or greater!])
+		)
 
 CHECK_PATH_MYSQL(:,
 		AC_MSG_ERROR([*** Mysql client libraries not found!])
@@ -20,10 +24,8 @@ CHECK_PATH_MYSQL(:,
 
 CHECK_PATH_MOD_SSL(
 		AC_DEFINE(WANT_SSL_LOGGING,,[Define if we want to compile in SSL support.])
-		AC_MSG_WARN([*** Compilng with SSL support!]),
-		AC_MSG_WARN([*** Compiling without SSL support!])
-		AC_MSG_WARN([*** enable with --enable-ssl to enable])
-		AC_MSG_WARN([*** and --with-ssl-inc with the the directory for SSL headers])
+		conf_SSL=1,
+		conf_SSL=0
 		)
 
 AC_CHECK_HEADERS(limits.h)
@@ -33,3 +35,13 @@ AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
 dnl Write config.status and the Makefile
 
 AC_OUTPUT(Makefile Documentation/Makefile)
+
+AC_MSG_RESULT([------------------------------------])
+AC_MSG_RESULT([Apache version	: $APACHE_VERSION])
+if test $conf_SSL -eq 1; then
+	AC_MSG_RESULT([SSL Support	: yes])
+else
+	AC_MSG_RESULT([SSL Support	: no])
+	AC_MSG_RESULT([*** Use --enable-ssl to enable SSL support])
+	AC_MSG_RESULT([*** and --with-ssl-inc for the directory for SSL headers])
+fi
--
cgit v0.9.2